diff mbox

[U-Boot,v2] powerpc/mpc8548cds: Update config file

Message ID 1318200948-21472-1-git-send-email-galak@kernel.crashing.org
State Accepted
Commit 867b06f434a3184deeabd2bddb5178439dc6e445
Headers show

Commit Message

Kumar Gala Oct. 9, 2011, 10:55 p.m. UTC 
From: chenhui zhao <chenhui.zhao@freescale.com>

- Increase the size of malloc space.
- Enable e1000 network card.
- Show pci devices on startup.
- Change the location of env address.
- Use hwconfig to turn off ECC by default.

[Kumar Gala] Fixed white space formating for CONFIG_EXTRA_ENV_SETTINGS

Signed-off-by: Zhao Chenhui <chenhui.zhao@freescale.com>
Signed-off-by: Kumar Gala <galak@kernel.crashing.org>
---
* fixed whitespace / checkpatch issue

 include/configs/MPC8548CDS.h |   44 ++++++++++++++++++++++++-----------------
 1 files changed, 26 insertions(+), 18 deletions(-)

Comments

Tabi Timur-B04825 Oct. 9, 2011, 11:41 p.m. UTC | #1 
On Sun, Oct 9, 2011 at 5:55 PM, Kumar Gala <galak@kernel.crashing.org> wrote:
>
> - Increase the size of malloc space.
> - Enable e1000 network card.
> - Show pci devices on startup.
> - Change the location of env address.
> - Use hwconfig to turn off ECC by default.

This patch is missing all of the explanations that were provided by
the developer on the internal mailing list.  In particular, Wolfgang
previously stated that he did not want CONFIG_PCI_SCAN_SHOW enabled by
default.
Kumar Gala Oct. 10, 2011, 12:02 a.m. UTC | #2 
On Oct 9, 2011, at 6:41 PM, Tabi Timur-B04825 wrote:

> On Sun, Oct 9, 2011 at 5:55 PM, Kumar Gala <galak@kernel.crashing.org> wrote:
>> 
>> - Increase the size of malloc space.
>> - Enable e1000 network card.
>> - Show pci devices on startup.
>> - Change the location of env address.
>> - Use hwconfig to turn off ECC by default.
> 
> This patch is missing all of the explanations that were provided by
> the developer on the internal mailing list.  In particular, Wolfgang
> previously stated that he did not want CONFIG_PCI_SCAN_SHOW enabled by
> default.

* The only things not explained is the env address change.  I can see it matches our other boards MPC8572DS, etc.  So not exactly critical to me.
* If Wolfgang wants to remove CONFIG_PCI_SCAN_SHOW so be it, but as long as it exists I think its the board maintainers purview if they want it enabled.

- k
Tabi Timur-B04825 Oct. 10, 2011, 12:07 a.m. UTC | #3 
Kumar Gala wrote:
> * The only things not explained is the env address change.  I can see
> it matches our other boards MPC8572DS, etc.  So not exactly critical to
> me.

There's no explanation for increasing the malloc size.

> * If Wolfgang wants to remove CONFIG_PCI_SCAN_SHOW so be it, but as
> long as it exists I think its the board maintainers purview if they
> want it enabled.

Seriously?  I've lost count the number of times I've been bitch-slapped by 
Wolfgang for adding a board-specific patch that he didn't like.
diff mbox

Patch

diff --git a/include/configs/MPC8548CDS.h b/include/configs/MPC8548CDS.h
index 63e23c2..ab887c1 100644
--- a/include/configs/MPC8548CDS.h
+++ b/include/configs/MPC8548CDS.h
@@ -86,6 +86,7 @@  extern unsigned long get_clock_freq(void);
 #define CONFIG_SPD_EEPROM		/* Use SPD EEPROM for DDR setup*/
 #define CONFIG_DDR_SPD
 
+#define CONFIG_DDR_ECC
 #define CONFIG_ECC_INIT_VIA_DDRCONTROLLER	/* DDR controller or DMA? */
 #define CONFIG_MEM_INIT_VALUE	0xDeadBeef
 
@@ -162,6 +163,7 @@  extern unsigned long get_clock_freq(void);
 #define CONFIG_SYS_FLASH_CFI
 #define CONFIG_SYS_FLASH_EMPTY_INFO
 
+#define CONFIG_HWCONFIG			/* enable hwconfig */
 
 /*
  * SDRAM on the Local Bus
@@ -276,7 +278,7 @@  extern unsigned long get_clock_freq(void);
 #define CONFIG_SYS_INIT_SP_OFFSET	CONFIG_SYS_GBL_DATA_OFFSET
 
 #define CONFIG_SYS_MONITOR_LEN		(256 * 1024) /* Reserve 256 kB for Mon */
-#define CONFIG_SYS_MALLOC_LEN		(128 * 1024)	/* Reserved for malloc */
+#define CONFIG_SYS_MALLOC_LEN	(1024 * 1024)	/* Reserved for malloc */
 
 /* Serial Port */
 #define CONFIG_CONS_INDEX	2
@@ -381,8 +383,9 @@  extern unsigned long get_clock_freq(void);
 
 #undef CONFIG_EEPRO100
 #undef CONFIG_TULIP
+#define CONFIG_E1000			/* Define e1000 pci Ethernet card */
 
-#undef CONFIG_PCI_SCAN_SHOW		/* show pci devices on startup */
+#define CONFIG_PCI_SCAN_SHOW		/* show pci devices on startup */
 
 #endif	/* CONFIG_PCI */
 
@@ -423,8 +426,12 @@  extern unsigned long get_clock_freq(void);
  * Environment
  */
 #define CONFIG_ENV_IS_IN_FLASH	1
-#define CONFIG_ENV_ADDR		(CONFIG_SYS_MONITOR_BASE + 0x40000)
-#define CONFIG_ENV_SECT_SIZE	0x40000	/* 256K(one sector) for env */
+#if CONFIG_SYS_MONITOR_BASE > 0xfff80000
+#define CONFIG_ENV_ADDR	0xfff80000
+#else
+#define CONFIG_ENV_ADDR	(CONFIG_SYS_MONITOR_BASE - CONFIG_ENV_SECT_SIZE)
+#endif
+#define CONFIG_ENV_SECT_SIZE	0x20000	/* 128K for env */
 #define CONFIG_ENV_SIZE		0x2000
 
 #define CONFIG_LOADS_ECHO	1	/* echo on for serial download */
@@ -524,20 +531,21 @@  extern unsigned long get_clock_freq(void);
 
 #define CONFIG_BAUDRATE	115200
 
-#define	CONFIG_EXTRA_ENV_SETTINGS				\
- "netdev=eth0\0"						\
- "uboot=" MK_STR(CONFIG_UBOOTPATH) "\0"				\
- "tftpflash=tftpboot $loadaddr $uboot; "			\
-	"protect off " MK_STR(CONFIG_SYS_TEXT_BASE) " +$filesize; "	\
-	"erase " MK_STR(CONFIG_SYS_TEXT_BASE) " +$filesize; "		\
-	"cp.b $loadaddr " MK_STR(CONFIG_SYS_TEXT_BASE) " $filesize; "	\
-	"protect on " MK_STR(CONFIG_SYS_TEXT_BASE) " +$filesize; "		\
-	"cmp.b $loadaddr " MK_STR(CONFIG_SYS_TEXT_BASE) " $filesize\0"	\
- "consoledev=ttyS1\0"				\
- "ramdiskaddr=2000000\0"			\
- "ramdiskfile=ramdisk.uboot\0"			\
- "fdtaddr=c00000\0"				\
- "fdtfile=mpc8548cds.dtb\0"
+#define	CONFIG_EXTRA_ENV_SETTINGS		\
+	"hwconfig=fsl_ddr:ecc=off\0"		\
+	"netdev=eth0\0"				\
+	"uboot=" MK_STR(CONFIG_UBOOTPATH) "\0"	\
+	"tftpflash=tftpboot $loadaddr $uboot; "	\
+		"protect off " MK_STR(CONFIG_SYS_TEXT_BASE) " +$filesize; "   \
+		"erase " MK_STR(CONFIG_SYS_TEXT_BASE) " +$filesize; "	      \
+		"cp.b $loadaddr " MK_STR(CONFIG_SYS_TEXT_BASE) " $filesize; " \
+		"protect on " MK_STR(CONFIG_SYS_TEXT_BASE) " +$filesize; "    \
+		"cmp.b $loadaddr " MK_STR(CONFIG_SYS_TEXT_BASE) " $filesize\0"\
+	"consoledev=ttyS1\0"			\
+	"ramdiskaddr=2000000\0"			\
+	"ramdiskfile=ramdisk.uboot\0"		\
+	"fdtaddr=c00000\0"			\
+	"fdtfile=mpc8548cds.dtb\0"
 
 #define CONFIG_NFSBOOTCOMMAND						\
    "setenv bootargs root=/dev/nfs rw "					\