Eric Lee / smarc-uboot

Download as
Browse Code ยป

Commit 867b06f434a3184deeabd2bddb5178439dc6e445

Authored by chenhui zhao
Committed by Kumar Gala
1 parent 1605cc9e1b
Exists in master and in 55 other branches 8qm-imx_v2020.04_5.4.70_2.3.0, emb_lf_v2022.04, emb_lf_v2023.04, imx_v2015.04_4.1.15_1.0.0_ga, pitx_8mp_lf_v2020.04, smarc-8m-android-10.0.0_2.6.0, smarc-8m-android-11.0.0_2.0.0, smarc-8mp-android-11.0.0_2.0.0, smarc-emmc-imx_v2014.04_3.10.53_1.1.0_ga, smarc-emmc-imx_v2014.04_3.14.28_1.0.0_ga, smarc-imx-l5.0.0_1.0.0-ga, smarc-imx6_v2018.03_4.14.98_2.0.0_ga, smarc-imx7_v2017.03_4.9.11_1.0.0_ga, smarc-imx7_v2018.03_4.14.98_2.0.0_ga, smarc-imx_v2014.04_3.14.28_1.0.0_ga, smarc-imx_v2015.04_4.1.15_1.0.0_ga, smarc-imx_v2017.03_4.9.11_1.0.0_ga, smarc-imx_v2017.03_4.9.88_2.0.0_ga, smarc-imx_v2017.03_o8.1.0_1.3.0_8m, smarc-imx_v2018.03_4.14.78_1.0.0_ga, smarc-m6.0.1_2.1.0-ga, smarc-n7.1.2_2.0.0-ga, smarc-rel_imx_4.1.15_2.0.0_ga, smarc_8m-imx_v2018.03_4.14.98_2.0.0_ga, smarc_8m-imx_v2019.04_4.19.35_1.1.0, smarc_8m_00d0-imx_v2018.03_4.14.98_2.0.0_ga, smarc_8mm-imx_v2018.03_4.14.98_2.0.0_ga, smarc_8mm-imx_v2019.04_4.19.35_1.1.0, smarc_8mm-imx_v2020.04_5.4.24_2.1.0, smarc_8mp_lf_v2020.04, smarc_8mq-imx_v2020.04_5.4.24_2.1.0, smarc_8mq_lf_v2020.04, ti-u-boot-2015.07, u-boot-2013.01.y, v2013.10, v2013.10-smarct33, v2013.10-smartmen, v2014.01, v2014.04, v2014.04-smarct33, v2014.04-smarct33-emmc, v2014.04-smartmen, v2014.07, v2014.07-smarct33, v2014.07-smartmen, v2015.07-smarct33, v2015.07-smarct33-emmc, v2015.07-smarct4x, v2016.05-dlt, v2016.05-smarct3x, v2016.05-smarct3x-emmc, v2016.05-smarct4x, v2017.01-smarct3x, v2017.01-smarct3x-emmc, v2017.01-smarct4x

powerpc/mpc8548cds: Update config file 

- 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>

Showing 1 changed file with 26 additions and 18 deletions Side-by-side Diff

include/configs/MPC8548CDS.h
Diff comments   View file @ 867b06f
... ... @@ -86,6 +86,7 @@
86 86 #define CONFIG_SPD_EEPROM /* Use SPD EEPROM for DDR setup*/
87 87 #define CONFIG_DDR_SPD
88 88  
  89 +#define CONFIG_DDR_ECC
89 90 #define CONFIG_ECC_INIT_VIA_DDRCONTROLLER /* DDR controller or DMA? */
90 91 #define CONFIG_MEM_INIT_VALUE 0xDeadBeef
91 92  
... ... @@ -162,6 +163,7 @@
162 163 #define CONFIG_SYS_FLASH_CFI
163 164 #define CONFIG_SYS_FLASH_EMPTY_INFO
164 165  
  166 +#define CONFIG_HWCONFIG /* enable hwconfig */
165 167  
166 168 /*
167 169 * SDRAM on the Local Bus
... ... @@ -276,7 +278,7 @@
276 278 #define CONFIG_SYS_INIT_SP_OFFSET CONFIG_SYS_GBL_DATA_OFFSET
277 279  
278 280 #define CONFIG_SYS_MONITOR_LEN (256 * 1024) /* Reserve 256 kB for Mon */
279   -#define CONFIG_SYS_MALLOC_LEN (128 * 1024) /* Reserved for malloc */
  281 +#define CONFIG_SYS_MALLOC_LEN (1024 * 1024) /* Reserved for malloc */
280 282  
281 283 /* Serial Port */
282 284 #define CONFIG_CONS_INDEX 2
283 285  
... ... @@ -381,8 +383,9 @@
381 383  
382 384 #undef CONFIG_EEPRO100
383 385 #undef CONFIG_TULIP
  386 +#define CONFIG_E1000 /* Define e1000 pci Ethernet card */
384 387  
385   -#undef CONFIG_PCI_SCAN_SHOW /* show pci devices on startup */
  388 +#define CONFIG_PCI_SCAN_SHOW /* show pci devices on startup */
386 389  
387 390 #endif /* CONFIG_PCI */
388 391  
... ... @@ -423,8 +426,12 @@
423 426 * Environment
424 427 */
425 428 #define CONFIG_ENV_IS_IN_FLASH 1
426   -#define CONFIG_ENV_ADDR (CONFIG_SYS_MONITOR_BASE + 0x40000)
427   -#define CONFIG_ENV_SECT_SIZE 0x40000 /* 256K(one sector) for env */
  429 +#if CONFIG_SYS_MONITOR_BASE > 0xfff80000
  430 +#define CONFIG_ENV_ADDR 0xfff80000
  431 +#else
  432 +#define CONFIG_ENV_ADDR (CONFIG_SYS_MONITOR_BASE - CONFIG_ENV_SECT_SIZE)
  433 +#endif
  434 +#define CONFIG_ENV_SECT_SIZE 0x20000 /* 128K for env */
428 435 #define CONFIG_ENV_SIZE 0x2000
429 436  
430 437 #define CONFIG_LOADS_ECHO 1 /* echo on for serial download */
... ... @@ -524,20 +531,21 @@
524 531  
525 532 #define CONFIG_BAUDRATE 115200
526 533  
527   -#define CONFIG_EXTRA_ENV_SETTINGS \
528   - "netdev=eth0\0" \
529   - "uboot=" MK_STR(CONFIG_UBOOTPATH) "\0" \
530   - "tftpflash=tftpboot $loadaddr $uboot; " \
531   - "protect off " MK_STR(CONFIG_SYS_TEXT_BASE) " +$filesize; " \
532   - "erase " MK_STR(CONFIG_SYS_TEXT_BASE) " +$filesize; " \
533   - "cp.b $loadaddr " MK_STR(CONFIG_SYS_TEXT_BASE) " $filesize; " \
534   - "protect on " MK_STR(CONFIG_SYS_TEXT_BASE) " +$filesize; " \
535   - "cmp.b $loadaddr " MK_STR(CONFIG_SYS_TEXT_BASE) " $filesize\0" \
536   - "consoledev=ttyS1\0" \
537   - "ramdiskaddr=2000000\0" \
538   - "ramdiskfile=ramdisk.uboot\0" \
539   - "fdtaddr=c00000\0" \
540   - "fdtfile=mpc8548cds.dtb\0"
  534 +#define CONFIG_EXTRA_ENV_SETTINGS \
  535 + "hwconfig=fsl_ddr:ecc=off\0" \
  536 + "netdev=eth0\0" \
  537 + "uboot=" MK_STR(CONFIG_UBOOTPATH) "\0" \
  538 + "tftpflash=tftpboot $loadaddr $uboot; " \
  539 + "protect off " MK_STR(CONFIG_SYS_TEXT_BASE) " +$filesize; " \
  540 + "erase " MK_STR(CONFIG_SYS_TEXT_BASE) " +$filesize; " \
  541 + "cp.b $loadaddr " MK_STR(CONFIG_SYS_TEXT_BASE) " $filesize; " \
  542 + "protect on " MK_STR(CONFIG_SYS_TEXT_BASE) " +$filesize; " \
  543 + "cmp.b $loadaddr " MK_STR(CONFIG_SYS_TEXT_BASE) " $filesize\0"\
  544 + "consoledev=ttyS1\0" \
  545 + "ramdiskaddr=2000000\0" \
  546 + "ramdiskfile=ramdisk.uboot\0" \
  547 + "fdtaddr=c00000\0" \
  548 + "fdtfile=mpc8548cds.dtb\0"
541 549  
542 550 #define CONFIG_NFSBOOTCOMMAND \
543 551 "setenv bootargs root=/dev/nfs rw " \