diff options
Diffstat (limited to 'include')
375 files changed, 1022 insertions, 535 deletions
diff --git a/include/asm-generic/global_data.h b/include/asm-generic/global_data.h index e02863d..5b356dd 100644 --- a/include/asm-generic/global_data.h +++ b/include/asm-generic/global_data.h @@ -127,5 +127,6 @@ typedef struct global_data { #define GD_FLG_SKIP_RELOC 0x00800 /* Don't relocate */ #define GD_FLG_RECORD 0x01000 /* Record console */ #define GD_FLG_ENV_DEFAULT 0x02000 /* Default variable flag */ +#define GD_FLG_SPL_EARLY_INIT 0x04000 /* Early SPL init is done */ #endif /* __ASM_GENERIC_GBL_DATA_H */ diff --git a/include/configs/10m50_devboard.h b/include/configs/10m50_devboard.h index 2cb8f5a..ea980e6 100644 --- a/include/configs/10m50_devboard.h +++ b/include/configs/10m50_devboard.h @@ -17,7 +17,6 @@ /* * SERIAL */ -#define CONFIG_BAUDRATE 115200 #define CONFIG_SYS_NS16550_MEM32 /* diff --git a/include/configs/3c120_devboard.h b/include/configs/3c120_devboard.h index b9f5439..6527177 100644 --- a/include/configs/3c120_devboard.h +++ b/include/configs/3c120_devboard.h @@ -17,7 +17,6 @@ /* * SERIAL */ -#define CONFIG_BAUDRATE 115200 /* * CFI Flash diff --git a/include/configs/B4860QDS.h b/include/configs/B4860QDS.h index 2a205cd..078b215 100644 --- a/include/configs/B4860QDS.h +++ b/include/configs/B4860QDS.h @@ -770,9 +770,6 @@ unsigned long get_board_ddr_clk(void); /* default location for tftp and bootm */ #define CONFIG_LOADADDR 1000000 - -#define CONFIG_BAUDRATE 115200 - #define __USB_PHY_TYPE ulpi #ifdef CONFIG_ARCH_B4860 diff --git a/include/configs/BSC9131RDB.h b/include/configs/BSC9131RDB.h index 282366c..6f333e7 100644 --- a/include/configs/BSC9131RDB.h +++ b/include/configs/BSC9131RDB.h @@ -365,8 +365,6 @@ extern unsigned long get_sdram_size(void); #define CONFIG_BOOTFILE "uImage" #define CONFIG_UBOOTPATH "u-boot.bin" /* U-Boot image on TFTP server */ -#define CONFIG_BAUDRATE 115200 - #define CONFIG_EXTRA_ENV_SETTINGS \ "netdev=eth0\0" \ "uboot=" CONFIG_UBOOTPATH "\0" \ diff --git a/include/configs/BSC9132QDS.h b/include/configs/BSC9132QDS.h index 969f448..b23ec8f 100644 --- a/include/configs/BSC9132QDS.h +++ b/include/configs/BSC9132QDS.h @@ -590,8 +590,6 @@ combinations. this should be removed later #define CONFIG_BOOTFILE "uImage" #define CONFIG_UBOOTPATH "u-boot.bin" -#define CONFIG_BAUDRATE 115200 - #ifdef CONFIG_SDCARD #define CONFIG_DEF_HWCONFIG "hwconfig=usb1:dr_mode=host,phy_type=ulpi\0" #else diff --git a/include/configs/C29XPCIE.h b/include/configs/C29XPCIE.h index 3af2425..f95c3b9 100644 --- a/include/configs/C29XPCIE.h +++ b/include/configs/C29XPCIE.h @@ -485,9 +485,6 @@ /* default location for tftp and bootm */ #define CONFIG_LOADADDR 1000000 - -#define CONFIG_BAUDRATE 115200 - #define CONFIG_DEF_HWCONFIG fsl_ddr:ecc=on #define CONFIG_EXTRA_ENV_SETTINGS \ diff --git a/include/configs/CPCI2DP.h b/include/configs/CPCI2DP.h index ff46020..bc5fa03 100644 --- a/include/configs/CPCI2DP.h +++ b/include/configs/CPCI2DP.h @@ -23,8 +23,6 @@ #define CONFIG_SYS_CLK_FREQ 33330000 /* external frequency to pll */ -#define CONFIG_BAUDRATE 9600 - #undef CONFIG_BOOTARGS #undef CONFIG_BOOTCOMMAND diff --git a/include/configs/CPCI4052.h b/include/configs/CPCI4052.h index 07dac8a..feabc5f 100644 --- a/include/configs/CPCI4052.h +++ b/include/configs/CPCI4052.h @@ -28,8 +28,6 @@ #define CONFIG_SYS_CLK_FREQ 33330000 /* external frequency to pll */ -#define CONFIG_BAUDRATE 9600 - #undef CONFIG_BOOTARGS #undef CONFIG_BOOTCOMMAND diff --git a/include/configs/M5208EVBE.h b/include/configs/M5208EVBE.h index b426c18..f8b1d4a 100644 --- a/include/configs/M5208EVBE.h +++ b/include/configs/M5208EVBE.h @@ -16,7 +16,6 @@ */ #define CONFIG_MCFUART #define CONFIG_SYS_UART_PORT (0) -#define CONFIG_BAUDRATE 115200 #undef CONFIG_WATCHDOG #define CONFIG_WATCHDOG_TIMEOUT 5000 diff --git a/include/configs/M52277EVB.h b/include/configs/M52277EVB.h index 98ccbe3..126f889 100644 --- a/include/configs/M52277EVB.h +++ b/include/configs/M52277EVB.h @@ -22,7 +22,6 @@ #define CONFIG_MCFUART #define CONFIG_SYS_UART_PORT (0) -#define CONFIG_BAUDRATE 115200 #undef CONFIG_WATCHDOG diff --git a/include/configs/M5235EVB.h b/include/configs/M5235EVB.h index 0062228..7247111 100644 --- a/include/configs/M5235EVB.h +++ b/include/configs/M5235EVB.h @@ -21,7 +21,6 @@ #define CONFIG_MCFUART #define CONFIG_SYS_UART_PORT (0) -#define CONFIG_BAUDRATE 115200 #undef CONFIG_WATCHDOG #define CONFIG_WATCHDOG_TIMEOUT 5000 /* timeout in milliseconds, max timeout is 6.71sec */ diff --git a/include/configs/M5249EVB.h b/include/configs/M5249EVB.h index d61c68f..4ef83f7 100644 --- a/include/configs/M5249EVB.h +++ b/include/configs/M5249EVB.h @@ -22,7 +22,6 @@ #define CONFIG_MCFUART #define CONFIG_SYS_UART_PORT (0) -#define CONFIG_BAUDRATE 115200 #undef CONFIG_WATCHDOG diff --git a/include/configs/M5253DEMO.h b/include/configs/M5253DEMO.h index 2733457..b1a49b0 100644 --- a/include/configs/M5253DEMO.h +++ b/include/configs/M5253DEMO.h @@ -13,7 +13,6 @@ #define CONFIG_MCFUART #define CONFIG_SYS_UART_PORT (0) -#define CONFIG_BAUDRATE 115200 #undef CONFIG_WATCHDOG /* disable watchdog */ diff --git a/include/configs/M5253EVBE.h b/include/configs/M5253EVBE.h index 5cba541..380221e 100644 --- a/include/configs/M5253EVBE.h +++ b/include/configs/M5253EVBE.h @@ -14,7 +14,6 @@ #define CONFIG_MCFUART #define CONFIG_SYS_UART_PORT (0) -#define CONFIG_BAUDRATE 115200 #undef CONFIG_WATCHDOG /* disable watchdog */ diff --git a/include/configs/M5272C3.h b/include/configs/M5272C3.h index a858904..0b0e4e6 100644 --- a/include/configs/M5272C3.h +++ b/include/configs/M5272C3.h @@ -21,7 +21,6 @@ #define CONFIG_MCFUART #define CONFIG_SYS_UART_PORT (0) -#define CONFIG_BAUDRATE 115200 #undef CONFIG_WATCHDOG #define CONFIG_WATCHDOG_TIMEOUT 10000 /* timeout in milliseconds */ diff --git a/include/configs/M5275EVB.h b/include/configs/M5275EVB.h index 1bdacbc..5d324ba 100644 --- a/include/configs/M5275EVB.h +++ b/include/configs/M5275EVB.h @@ -27,7 +27,6 @@ #define CONFIG_MCFUART #define CONFIG_SYS_UART_PORT (0) -#define CONFIG_BAUDRATE 115200 /* Configuration for environment * Environment is embedded in u-boot in the second sector of the flash diff --git a/include/configs/M5282EVB.h b/include/configs/M5282EVB.h index 62f25e9..061a632 100644 --- a/include/configs/M5282EVB.h +++ b/include/configs/M5282EVB.h @@ -21,7 +21,6 @@ #define CONFIG_MCFUART #define CONFIG_SYS_UART_PORT (0) -#define CONFIG_BAUDRATE 115200 #undef CONFIG_MONITOR_IS_IN_RAM /* define if monitor is started from a pre-loader */ diff --git a/include/configs/M53017EVB.h b/include/configs/M53017EVB.h index 03c18da..0c18b14 100644 --- a/include/configs/M53017EVB.h +++ b/include/configs/M53017EVB.h @@ -21,7 +21,6 @@ #define CONFIG_MCFUART #define CONFIG_SYS_UART_PORT (0) -#define CONFIG_BAUDRATE 115200 #undef CONFIG_WATCHDOG #define CONFIG_WATCHDOG_TIMEOUT 5000 diff --git a/include/configs/M5329EVB.h b/include/configs/M5329EVB.h index fabbaf0..46c50ea 100644 --- a/include/configs/M5329EVB.h +++ b/include/configs/M5329EVB.h @@ -21,7 +21,6 @@ #define CONFIG_MCFUART #define CONFIG_SYS_UART_PORT (0) -#define CONFIG_BAUDRATE 115200 #undef CONFIG_WATCHDOG #define CONFIG_WATCHDOG_TIMEOUT 5000 /* timeout in milliseconds, max timeout is 6.71sec */ diff --git a/include/configs/M5373EVB.h b/include/configs/M5373EVB.h index 8fb16bc..0204cd5 100644 --- a/include/configs/M5373EVB.h +++ b/include/configs/M5373EVB.h @@ -21,7 +21,6 @@ #define CONFIG_MCFUART #define CONFIG_SYS_UART_PORT (0) -#define CONFIG_BAUDRATE 115200 #undef CONFIG_WATCHDOG #define CONFIG_WATCHDOG_TIMEOUT 3360 /* timeout in ms, max is 3.36 sec */ diff --git a/include/configs/M54418TWR.h b/include/configs/M54418TWR.h index cfa6c90..cbe0d1e 100644 --- a/include/configs/M54418TWR.h +++ b/include/configs/M54418TWR.h @@ -22,7 +22,6 @@ #define CONFIG_MCFUART #define CONFIG_SYS_UART_PORT (0) -#define CONFIG_BAUDRATE 115200 #define CONFIG_SYS_BAUDRATE_TABLE { 9600 , 19200 , 38400 , 57600, 115200 } #undef CONFIG_WATCHDOG diff --git a/include/configs/M54451EVB.h b/include/configs/M54451EVB.h index 6a55e57..770472d 100644 --- a/include/configs/M54451EVB.h +++ b/include/configs/M54451EVB.h @@ -22,7 +22,6 @@ #define CONFIG_MCFUART #define CONFIG_SYS_UART_PORT (0) -#define CONFIG_BAUDRATE 115200 #undef CONFIG_WATCHDOG diff --git a/include/configs/M54455EVB.h b/include/configs/M54455EVB.h index 0eed59e..db80871 100644 --- a/include/configs/M54455EVB.h +++ b/include/configs/M54455EVB.h @@ -22,7 +22,6 @@ #define CONFIG_MCFUART #define CONFIG_SYS_UART_PORT (0) -#define CONFIG_BAUDRATE 115200 #undef CONFIG_WATCHDOG diff --git a/include/configs/M5475EVB.h b/include/configs/M5475EVB.h index f10c3f0..2c31d99 100644 --- a/include/configs/M5475EVB.h +++ b/include/configs/M5475EVB.h @@ -21,7 +21,6 @@ #define CONFIG_MCFUART #define CONFIG_SYS_UART_PORT (0) -#define CONFIG_BAUDRATE 115200 #undef CONFIG_HW_WATCHDOG #define CONFIG_WATCHDOG_TIMEOUT 5000 /* timeout in milliseconds, max timeout is 6.71sec */ diff --git a/include/configs/M5485EVB.h b/include/configs/M5485EVB.h index 2ae8d25..b9222e4 100644 --- a/include/configs/M5485EVB.h +++ b/include/configs/M5485EVB.h @@ -21,7 +21,6 @@ #define CONFIG_MCFUART #define CONFIG_SYS_UART_PORT (0) -#define CONFIG_BAUDRATE 115200 #undef CONFIG_HW_WATCHDOG #define CONFIG_WATCHDOG_TIMEOUT 5000 /* timeout in milliseconds, max timeout is 6.71sec */ diff --git a/include/configs/MIP405.h b/include/configs/MIP405.h index b59c53e..d362197 100644 --- a/include/configs/MIP405.h +++ b/include/configs/MIP405.h @@ -92,7 +92,6 @@ /************************************************************** * Environment definitions **************************************************************/ -#define CONFIG_BAUDRATE 9600 /* STD Baudrate */ /* autoboot (do NOT change this set environment variable "bootdelay" to -1 instead) */ /* #define CONFIG_BOOT_RETRY_TIME -10 /XXX* feature is available but not enabled */ diff --git a/include/configs/MPC8308RDB.h b/include/configs/MPC8308RDB.h index 4dbc2ba..b9745f6 100644 --- a/include/configs/MPC8308RDB.h +++ b/include/configs/MPC8308RDB.h @@ -500,8 +500,6 @@ #define CONFIG_HAS_ETH1 #endif -#define CONFIG_BAUDRATE 115200 - #define CONFIG_LOADADDR 800000 /* default location for tftp and bootm */ diff --git a/include/configs/MPC8313ERDB.h b/include/configs/MPC8313ERDB.h index 64a1467..32ca242 100644 --- a/include/configs/MPC8313ERDB.h +++ b/include/configs/MPC8313ERDB.h @@ -643,7 +643,6 @@ /* default location for tftp and bootm */ #define CONFIG_LOADADDR 800000 -#define CONFIG_BAUDRATE 115200 #define CONFIG_EXTRA_ENV_SETTINGS \ "netdev=" CONFIG_NETDEV "\0" \ diff --git a/include/configs/MPC8315ERDB.h b/include/configs/MPC8315ERDB.h index 01fa3ae..3093c56 100644 --- a/include/configs/MPC8315ERDB.h +++ b/include/configs/MPC8315ERDB.h @@ -590,8 +590,6 @@ #define CONFIG_HAS_ETH1 #endif -#define CONFIG_BAUDRATE 115200 - #define CONFIG_LOADADDR 800000 /* default location for tftp and bootm */ #undef CONFIG_BOOTARGS /* the boot command will set bootargs */ diff --git a/include/configs/MPC8323ERDB.h b/include/configs/MPC8323ERDB.h index 5226b7e..d782fc3 100644 --- a/include/configs/MPC8323ERDB.h +++ b/include/configs/MPC8323ERDB.h @@ -487,7 +487,6 @@ /* default location for tftp and bootm */ #define CONFIG_LOADADDR 800000 -#define CONFIG_BAUDRATE 115200 #define CONFIG_EXTRA_ENV_SETTINGS \ "netdev=" CONFIG_NETDEV "\0" \ diff --git a/include/configs/MPC832XEMDS.h b/include/configs/MPC832XEMDS.h index 3aa1cc9..716fc38 100644 --- a/include/configs/MPC832XEMDS.h +++ b/include/configs/MPC832XEMDS.h @@ -561,8 +561,6 @@ #define CONFIG_HAS_ETH1 #endif -#define CONFIG_BAUDRATE 115200 - #define CONFIG_LOADADDR 800000 /* default location for tftp and bootm */ #undef CONFIG_BOOTARGS /* the boot command will set bootargs */ diff --git a/include/configs/MPC8349EMDS.h b/include/configs/MPC8349EMDS.h index 0e09465..70ef1b8 100644 --- a/include/configs/MPC8349EMDS.h +++ b/include/configs/MPC8349EMDS.h @@ -725,8 +725,6 @@ #undef CONFIG_BOOTARGS /* the boot command will set bootargs */ -#define CONFIG_BAUDRATE 115200 - #define CONFIG_PREBOOT "echo;" \ "echo Type \\\"run flash_nfs\\\" to mount root filesystem over NFS;" \ "echo" diff --git a/include/configs/MPC8349ITX.h b/include/configs/MPC8349ITX.h index 5f6fc8e..ecad625 100644 --- a/include/configs/MPC8349ITX.h +++ b/include/configs/MPC8349ITX.h @@ -356,7 +356,6 @@ boards, we say we have two, but don't display a message if we find only one. */ {300, 600, 1200, 2400, 4800, 9600, 19200, 38400, 115200} #define CONSOLE ttyS0 -#define CONFIG_BAUDRATE 115200 #define CONFIG_SYS_NS16550_COM1 (CONFIG_SYS_IMMR + 0x4500) #define CONFIG_SYS_NS16550_COM2 (CONFIG_SYS_IMMR + 0x4600) diff --git a/include/configs/MPC837XEMDS.h b/include/configs/MPC837XEMDS.h index 7c1dcfb..3227475 100644 --- a/include/configs/MPC837XEMDS.h +++ b/include/configs/MPC837XEMDS.h @@ -644,8 +644,6 @@ extern int board_pci_host_broken(void); #define CONFIG_HAS_ETH1 #endif -#define CONFIG_BAUDRATE 115200 - #define CONFIG_LOADADDR 800000 /* default location for tftp and bootm */ #undef CONFIG_BOOTARGS /* the boot command will set bootargs */ diff --git a/include/configs/MPC837XERDB.h b/include/configs/MPC837XERDB.h index a49b811..5bd0d52 100644 --- a/include/configs/MPC837XERDB.h +++ b/include/configs/MPC837XERDB.h @@ -668,7 +668,6 @@ /* default location for tftp and bootm */ #define CONFIG_LOADADDR 800000 -#define CONFIG_BAUDRATE 115200 #define CONFIG_EXTRA_ENV_SETTINGS \ "netdev=" CONFIG_NETDEV "\0" \ diff --git a/include/configs/MPC8536DS.h b/include/configs/MPC8536DS.h index b9eab4e..aeb9f0b 100644 --- a/include/configs/MPC8536DS.h +++ b/include/configs/MPC8536DS.h @@ -674,8 +674,6 @@ #undef CONFIG_BOOTARGS /* the boot command will set bootargs */ -#define CONFIG_BAUDRATE 115200 - #define CONFIG_EXTRA_ENV_SETTINGS \ "netdev=eth0\0" \ "uboot=" __stringify(CONFIG_UBOOTPATH) "\0" \ diff --git a/include/configs/MPC8540ADS.h b/include/configs/MPC8540ADS.h index 8fb16e9..c5d5815 100644 --- a/include/configs/MPC8540ADS.h +++ b/include/configs/MPC8540ADS.h @@ -378,8 +378,6 @@ #undef CONFIG_BOOTARGS /* the boot command will set bootargs */ -#define CONFIG_BAUDRATE 115200 - #define CONFIG_EXTRA_ENV_SETTINGS \ "netdev=eth0\0" \ "consoledev=ttyS0\0" \ diff --git a/include/configs/MPC8541CDS.h b/include/configs/MPC8541CDS.h index 00a18b5..4509a6d 100644 --- a/include/configs/MPC8541CDS.h +++ b/include/configs/MPC8541CDS.h @@ -404,8 +404,6 @@ extern unsigned long get_clock_freq(void); #undef CONFIG_BOOTARGS /* the boot command will set bootargs*/ -#define CONFIG_BAUDRATE 115200 - #define CONFIG_EXTRA_ENV_SETTINGS \ "netdev=eth0\0" \ "consoledev=ttyS1\0" \ diff --git a/include/configs/MPC8544DS.h b/include/configs/MPC8544DS.h index 5d76996..8f7e056 100644 --- a/include/configs/MPC8544DS.h +++ b/include/configs/MPC8544DS.h @@ -422,8 +422,6 @@ extern unsigned long get_board_sys_clk(unsigned long dummy); #undef CONFIG_BOOTARGS /* the boot command will set bootargs*/ -#define CONFIG_BAUDRATE 115200 - #define CONFIG_EXTRA_ENV_SETTINGS \ "netdev=eth0\0" \ "uboot=" __stringify(CONFIG_UBOOTPATH) "\0" \ diff --git a/include/configs/MPC8548CDS.h b/include/configs/MPC8548CDS.h index c241b51..df50fa3 100644 --- a/include/configs/MPC8548CDS.h +++ b/include/configs/MPC8548CDS.h @@ -523,8 +523,6 @@ extern unsigned long get_clock_freq(void); #undef CONFIG_BOOTARGS /* the boot command will set bootargs*/ -#define CONFIG_BAUDRATE 115200 - #define CONFIG_EXTRA_ENV_SETTINGS \ "hwconfig=fsl_ddr:ecc=off\0" \ "netdev=eth0\0" \ diff --git a/include/configs/MPC8555CDS.h b/include/configs/MPC8555CDS.h index 6faa230..67093df 100644 --- a/include/configs/MPC8555CDS.h +++ b/include/configs/MPC8555CDS.h @@ -400,8 +400,6 @@ extern unsigned long get_clock_freq(void); #undef CONFIG_BOOTARGS /* the boot command will set bootargs*/ -#define CONFIG_BAUDRATE 115200 - #define CONFIG_EXTRA_ENV_SETTINGS \ "netdev=eth0\0" \ "consoledev=ttyS1\0" \ diff --git a/include/configs/MPC8560ADS.h b/include/configs/MPC8560ADS.h index f27bdee..8170b9f 100644 --- a/include/configs/MPC8560ADS.h +++ b/include/configs/MPC8560ADS.h @@ -208,8 +208,6 @@ #undef CONFIG_CONS_NONE /* define if console on something else */ #define CONFIG_CONS_INDEX 1 /* which serial channel for console */ -#define CONFIG_BAUDRATE 115200 - #define CONFIG_SYS_BAUDRATE_TABLE \ {300, 600, 1200, 2400, 4800, 9600, 19200, 38400,115200} @@ -422,8 +420,6 @@ #undef CONFIG_BOOTARGS /* the boot command will set bootargs */ -#define CONFIG_BAUDRATE 115200 - #define CONFIG_EXTRA_ENV_SETTINGS \ "netdev=eth0\0" \ "consoledev=ttyCPM\0" \ diff --git a/include/configs/MPC8568MDS.h b/include/configs/MPC8568MDS.h index 4296ba7..0bc71d4 100644 --- a/include/configs/MPC8568MDS.h +++ b/include/configs/MPC8568MDS.h @@ -418,8 +418,6 @@ extern unsigned long get_clock_freq(void); #undef CONFIG_BOOTARGS /* the boot command will set bootargs*/ -#define CONFIG_BAUDRATE 115200 - #define CONFIG_EXTRA_ENV_SETTINGS \ "netdev=eth0\0" \ "consoledev=ttyS0\0" \ diff --git a/include/configs/MPC8569MDS.h b/include/configs/MPC8569MDS.h index 91e17d9..81d2d4f 100644 --- a/include/configs/MPC8569MDS.h +++ b/include/configs/MPC8569MDS.h @@ -508,8 +508,6 @@ extern unsigned long get_clock_freq(void); #undef CONFIG_BOOTARGS /* the boot command will set bootargs*/ -#define CONFIG_BAUDRATE 115200 - #define CONFIG_EXTRA_ENV_SETTINGS \ "netdev=eth0\0" \ "consoledev=ttyS0\0" \ diff --git a/include/configs/MPC8572DS.h b/include/configs/MPC8572DS.h index 3d4c8a8..e6aca11 100644 --- a/include/configs/MPC8572DS.h +++ b/include/configs/MPC8572DS.h @@ -624,8 +624,6 @@ #undef CONFIG_BOOTARGS /* the boot command will set bootargs */ -#define CONFIG_BAUDRATE 115200 - #define CONFIG_EXTRA_ENV_SETTINGS \ "hwconfig=fsl_ddr:ctlr_intlv=bank,bank_intlv=cs0_cs1,ecc=off\0" \ "netdev=eth0\0" \ diff --git a/include/configs/MPC8610HPCD.h b/include/configs/MPC8610HPCD.h index 7427148..0e9aaf4 100644 --- a/include/configs/MPC8610HPCD.h +++ b/include/configs/MPC8610HPCD.h @@ -485,8 +485,6 @@ #undef CONFIG_BOOTARGS /* the boot command will set bootargs */ -#define CONFIG_BAUDRATE 115200 - #if defined(CONFIG_PCI1) #define PCI_ENV \ "pcireg=md ${a}000 3; echo o;md ${a}c00 25; echo i; md ${a}da0 15;" \ diff --git a/include/configs/MPC8641HPCN.h b/include/configs/MPC8641HPCN.h index 0e5bbc0..4b93210 100644 --- a/include/configs/MPC8641HPCN.h +++ b/include/configs/MPC8641HPCN.h @@ -650,8 +650,6 @@ extern unsigned long get_board_sys_clk(unsigned long dummy); #undef CONFIG_BOOTARGS /* the boot command will set bootargs */ -#define CONFIG_BAUDRATE 115200 - #define CONFIG_EXTRA_ENV_SETTINGS \ "netdev=eth0\0" \ "uboot=" __stringify(CONFIG_UBOOTPATH) "\0" \ diff --git a/include/configs/MigoR.h b/include/configs/MigoR.h index 75c5af6..7217426 100644 --- a/include/configs/MigoR.h +++ b/include/configs/MigoR.h @@ -14,7 +14,6 @@ #define CONFIG_CMD_SDRAM -#define CONFIG_BAUDRATE 115200 #define CONFIG_BOOTARGS "console=ttySC0,115200 root=1f01" #define CONFIG_DISPLAY_BOARDINFO diff --git a/include/configs/P1010RDB.h b/include/configs/P1010RDB.h index 05a2360..97a7570 100644 --- a/include/configs/P1010RDB.h +++ b/include/configs/P1010RDB.h @@ -793,8 +793,6 @@ extern unsigned long get_sdram_size(void); #undef CONFIG_BOOTARGS /* the boot command will set bootargs */ -#define CONFIG_BAUDRATE 115200 - #define CONFIG_EXTRA_ENV_SETTINGS \ "hwconfig=" __stringify(CONFIG_DEF_HWCONFIG) "\0" \ "netdev=eth0\0" \ diff --git a/include/configs/P1022DS.h b/include/configs/P1022DS.h index e601cc6..823eaf6 100644 --- a/include/configs/P1022DS.h +++ b/include/configs/P1022DS.h @@ -655,9 +655,6 @@ #define CONFIG_LOADADDR 1000000 - -#define CONFIG_BAUDRATE 115200 - #define CONFIG_EXTRA_ENV_SETTINGS \ "netdev=eth0\0" \ "uboot=" __stringify(CONFIG_UBOOTPATH) "\0" \ diff --git a/include/configs/P1023RDB.h b/include/configs/P1023RDB.h index 58a3507..787b8d2 100644 --- a/include/configs/P1023RDB.h +++ b/include/configs/P1023RDB.h @@ -295,9 +295,6 @@ extern unsigned long get_clock_freq(void); /* default location for tftp and bootm */ #define CONFIG_LOADADDR 1000000 - -#define CONFIG_BAUDRATE 115200 - /* Qman/Bman */ #define CONFIG_SYS_DPAA_QBMAN /* support Q/Bman */ #define CONFIG_SYS_QMAN_MEM_BASE 0xff000000 diff --git a/include/configs/P2041RDB.h b/include/configs/P2041RDB.h index 325baa2..c3e3fae 100644 --- a/include/configs/P2041RDB.h +++ b/include/configs/P2041RDB.h @@ -652,9 +652,6 @@ unsigned long get_board_sys_clk(unsigned long dummy); /* default location for tftp and bootm */ #define CONFIG_LOADADDR 1000000 - -#define CONFIG_BAUDRATE 115200 - #define __USB_PHY_TYPE utmi #define CONFIG_EXTRA_ENV_SETTINGS \ diff --git a/include/configs/PATI.h b/include/configs/PATI.h index cb343e5..2c048ab 100644 --- a/include/configs/PATI.h +++ b/include/configs/PATI.h @@ -25,8 +25,6 @@ #define CONFIG_5xx_CONS_SCI1 #undef CONFIG_5xx_CONS_SCI2 -#define CONFIG_BAUDRATE 9600 - /* * BOOTP options */ diff --git a/include/configs/PIP405.h b/include/configs/PIP405.h index ab7ac2b..b00cf8e 100644 --- a/include/configs/PIP405.h +++ b/include/configs/PIP405.h @@ -86,7 +86,6 @@ /************************************************************** * Environment definitions **************************************************************/ -#define CONFIG_BAUDRATE 9600 /* STD Baudrate */ /* autoboot (do NOT change this set environment variable "bootdelay" to -1 instead) */ /* #define CONFIG_BOOT_RETRY_TIME -10 /XXX* feature is available but not enabled */ diff --git a/include/configs/PLU405.h b/include/configs/PLU405.h index 397e933..3fc3bb8 100644 --- a/include/configs/PLU405.h +++ b/include/configs/PLU405.h @@ -26,8 +26,6 @@ #define CONFIG_SYS_CLK_FREQ 33333400 /* external frequency to pll */ -#define CONFIG_BAUDRATE 9600 - #undef CONFIG_BOOTARGS #undef CONFIG_BOOTCOMMAND diff --git a/include/configs/PMC405DE.h b/include/configs/PMC405DE.h index 71adc11..5c3f566 100644 --- a/include/configs/PMC405DE.h +++ b/include/configs/PMC405DE.h @@ -18,8 +18,6 @@ #define CONFIG_SYS_CLK_FREQ 33330000 /* external frequency to pll */ -#define CONFIG_BAUDRATE 115200 - #undef CONFIG_BOOTARGS #undef CONFIG_BOOTCOMMAND diff --git a/include/configs/PMC440.h b/include/configs/PMC440.h index 59ba79e..1b059d4 100644 --- a/include/configs/PMC440.h +++ b/include/configs/PMC440.h @@ -85,7 +85,6 @@ #define CONFIG_SYS_NS16550_REG_SIZE 1 #define CONFIG_SYS_NS16550_CLK get_serial_clock() #undef CONFIG_SYS_EXT_SERIAL_CLOCK -#define CONFIG_BAUDRATE 115200 #define CONFIG_SYS_BAUDRATE_TABLE \ {300, 600, 1200, 2400, 4800, 9600, 19200, 38400, 57600, 115200} diff --git a/include/configs/T102xQDS.h b/include/configs/T102xQDS.h index e850f54..5b4ea14 100644 --- a/include/configs/T102xQDS.h +++ b/include/configs/T102xQDS.h @@ -826,7 +826,6 @@ unsigned long get_board_ddr_clk(void); #define CONFIG_BOOTFILE "uImage" #define CONFIG_UBOOTPATH "u-boot.bin" /* U-Boot image on TFTP server */ #define CONFIG_LOADADDR 1000000 /* default location for tftp, bootm */ -#define CONFIG_BAUDRATE 115200 #define __USB_PHY_TYPE utmi #define CONFIG_EXTRA_ENV_SETTINGS \ diff --git a/include/configs/T102xRDB.h b/include/configs/T102xRDB.h index 9a4af80..c9a848f 100644 --- a/include/configs/T102xRDB.h +++ b/include/configs/T102xRDB.h @@ -836,7 +836,6 @@ unsigned long get_board_ddr_clk(void); #define CONFIG_BOOTFILE "uImage" #define CONFIG_UBOOTPATH u-boot.bin /* U-Boot image on TFTP server */ #define CONFIG_LOADADDR 1000000 /* default location for tftp, bootm */ -#define CONFIG_BAUDRATE 115200 #define __USB_PHY_TYPE utmi #ifdef CONFIG_ARCH_T1024 diff --git a/include/configs/T1040QDS.h b/include/configs/T1040QDS.h index 8343f37..0d60747 100644 --- a/include/configs/T1040QDS.h +++ b/include/configs/T1040QDS.h @@ -716,9 +716,6 @@ unsigned long get_board_ddr_clk(void); /* default location for tftp and bootm */ #define CONFIG_LOADADDR 1000000 - -#define CONFIG_BAUDRATE 115200 - #define __USB_PHY_TYPE utmi #define CONFIG_EXTRA_ENV_SETTINGS \ diff --git a/include/configs/T104xRDB.h b/include/configs/T104xRDB.h index bd1cfd4..5107dc3 100644 --- a/include/configs/T104xRDB.h +++ b/include/configs/T104xRDB.h @@ -847,9 +847,6 @@ $(SRCTREE)/board/freescale/t104xrdb/t1042d4_sd_rcw.cfg /* default location for tftp and bootm */ #define CONFIG_LOADADDR 1000000 - -#define CONFIG_BAUDRATE 115200 - #define __USB_PHY_TYPE utmi #define RAMDISKFILE "t104xrdb/ramdisk.uboot" diff --git a/include/configs/T208xQDS.h b/include/configs/T208xQDS.h index 17daf1d..a32ddee 100644 --- a/include/configs/T208xQDS.h +++ b/include/configs/T208xQDS.h @@ -797,7 +797,6 @@ unsigned long get_board_ddr_clk(void); /* default location for tftp and bootm */ #define CONFIG_LOADADDR 1000000 -#define CONFIG_BAUDRATE 115200 #define __USB_PHY_TYPE utmi #define CONFIG_EXTRA_ENV_SETTINGS \ diff --git a/include/configs/T208xRDB.h b/include/configs/T208xRDB.h index e3d57e6..90ce554 100644 --- a/include/configs/T208xRDB.h +++ b/include/configs/T208xRDB.h @@ -742,7 +742,6 @@ unsigned long get_board_ddr_clk(void); /* default location for tftp and bootm */ #define CONFIG_LOADADDR 1000000 -#define CONFIG_BAUDRATE 115200 #define __USB_PHY_TYPE utmi #define CONFIG_EXTRA_ENV_SETTINGS \ diff --git a/include/configs/T4240RDB.h b/include/configs/T4240RDB.h index e8ac43c..cc1f799 100644 --- a/include/configs/T4240RDB.h +++ b/include/configs/T4240RDB.h @@ -317,8 +317,6 @@ /* default location for tftp and bootm */ #define CONFIG_LOADADDR 1000000 -#define CONFIG_BAUDRATE 115200 - #define CONFIG_HVBOOT \ "setenv bootargs config-addr=0x60000000; " \ "bootm 0x01000000 - 0x00f00000" diff --git a/include/configs/TQM5200.h b/include/configs/TQM5200.h index 495fdc8..e5911d0 100644 --- a/include/configs/TQM5200.h +++ b/include/configs/TQM5200.h @@ -45,7 +45,6 @@ * Serial console configuration */ #define CONFIG_PSC_CONSOLE 1 /* console is on PSC1 */ -#define CONFIG_BAUDRATE 115200 /* ... at 115200 bps */ #define CONFIG_SYS_BAUDRATE_TABLE { 9600, 19200, 38400, 57600, 115200, 230400 } #define CONFIG_BOOTCOUNT_LIMIT 1 diff --git a/include/configs/TQM823L.h b/include/configs/TQM823L.h index bd58247..61748ca 100644 --- a/include/configs/TQM823L.h +++ b/include/configs/TQM823L.h @@ -32,7 +32,6 @@ #define CONFIG_8xx_CONS_SMC1 1 /* Console is on SMC1 */ #define CONFIG_SYS_SMC_RXBUFLEN 128 #define CONFIG_SYS_MAXIDLE 10 -#define CONFIG_BAUDRATE 115200 /* console baudrate = 115kbps */ #define CONFIG_BOOTCOUNT_LIMIT diff --git a/include/configs/TQM823M.h b/include/configs/TQM823M.h index 9d056cd..4b9ef9f 100644 --- a/include/configs/TQM823M.h +++ b/include/configs/TQM823M.h @@ -30,7 +30,6 @@ #define CONFIG_8xx_CONS_SMC1 1 /* Console is on SMC1 */ #define CONFIG_SYS_SMC_RXBUFLEN 128 #define CONFIG_SYS_MAXIDLE 10 -#define CONFIG_BAUDRATE 115200 /* console baudrate = 115kbps */ #define CONFIG_BOOTCOUNT_LIMIT diff --git a/include/configs/TQM834x.h b/include/configs/TQM834x.h index af19a51..42a9f77 100644 --- a/include/configs/TQM834x.h +++ b/include/configs/TQM834x.h @@ -478,8 +478,6 @@ #undef CONFIG_BOOTARGS /* the boot command will set bootargs */ -#define CONFIG_BAUDRATE 115200 - #define CONFIG_PREBOOT "echo;" \ "echo Type \\\"run flash_nfs\\\" to mount root filesystem over NFS;" \ "echo" diff --git a/include/configs/TQM850L.h b/include/configs/TQM850L.h index 225b3a8..7edfab9 100644 --- a/include/configs/TQM850L.h +++ b/include/configs/TQM850L.h @@ -25,7 +25,6 @@ #define CONFIG_8xx_CONS_SMC1 1 /* Console is on SMC1 */ #define CONFIG_SYS_SMC_RXBUFLEN 128 #define CONFIG_SYS_MAXIDLE 10 -#define CONFIG_BAUDRATE 115200 /* console baudrate = 115kbps */ #define CONFIG_BOOTCOUNT_LIMIT diff --git a/include/configs/TQM850M.h b/include/configs/TQM850M.h index 022a9ca..3931eba 100644 --- a/include/configs/TQM850M.h +++ b/include/configs/TQM850M.h @@ -25,7 +25,6 @@ #define CONFIG_8xx_CONS_SMC1 1 /* Console is on SMC1 */ #define CONFIG_SYS_SMC_RXBUFLEN 128 #define CONFIG_SYS_MAXIDLE 10 -#define CONFIG_BAUDRATE 115200 /* console baudrate = 115kbps */ #define CONFIG_BOOTCOUNT_LIMIT diff --git a/include/configs/TQM855L.h b/include/configs/TQM855L.h index aa7704c..9b2ec37 100644 --- a/include/configs/TQM855L.h +++ b/include/configs/TQM855L.h @@ -25,7 +25,6 @@ #define CONFIG_8xx_CONS_SMC1 1 /* Console is on SMC1 */ #define CONFIG_SYS_SMC_RXBUFLEN 128 #define CONFIG_SYS_MAXIDLE 10 -#define CONFIG_BAUDRATE 115200 /* console baudrate = 115kbps */ #define CONFIG_BOOTCOUNT_LIMIT diff --git a/include/configs/TQM855M.h b/include/configs/TQM855M.h index 5efd69d..b1b38e7 100644 --- a/include/configs/TQM855M.h +++ b/include/configs/TQM855M.h @@ -25,7 +25,6 @@ #define CONFIG_8xx_CONS_SMC1 1 /* Console is on SMC1 */ #define CONFIG_SYS_SMC_RXBUFLEN 128 #define CONFIG_SYS_MAXIDLE 10 -#define CONFIG_BAUDRATE 115200 /* console baudrate = 115kbps */ #define CONFIG_BOOTCOUNT_LIMIT diff --git a/include/configs/TQM860L.h b/include/configs/TQM860L.h index b7151b3..dc2fe30 100644 --- a/include/configs/TQM860L.h +++ b/include/configs/TQM860L.h @@ -25,7 +25,6 @@ #define CONFIG_8xx_CONS_SMC1 1 /* Console is on SMC1 */ #define CONFIG_SYS_SMC_RXBUFLEN 128 #define CONFIG_SYS_MAXIDLE 10 -#define CONFIG_BAUDRATE 115200 /* console baudrate = 115kbps */ #define CONFIG_BOOTCOUNT_LIMIT diff --git a/include/configs/TQM860M.h b/include/configs/TQM860M.h index 9efe5d0..06c9285 100644 --- a/include/configs/TQM860M.h +++ b/include/configs/TQM860M.h @@ -25,7 +25,6 @@ #define CONFIG_8xx_CONS_SMC1 1 /* Console is on SMC1 */ #define CONFIG_SYS_SMC_RXBUFLEN 128 #define CONFIG_SYS_MAXIDLE 10 -#define CONFIG_BAUDRATE 115200 /* console baudrate = 115kbps */ #define CONFIG_BOOTCOUNT_LIMIT diff --git a/include/configs/TQM862L.h b/include/configs/TQM862L.h index dc4dbaf..aca58b1 100644 --- a/include/configs/TQM862L.h +++ b/include/configs/TQM862L.h @@ -28,7 +28,6 @@ #define CONFIG_8xx_CONS_SMC1 1 /* Console is on SMC1 */ #define CONFIG_SYS_SMC_RXBUFLEN 128 #define CONFIG_SYS_MAXIDLE 10 -#define CONFIG_BAUDRATE 115200 /* console baudrate = 115kbps */ #define CONFIG_BOOTCOUNT_LIMIT diff --git a/include/configs/TQM862M.h b/include/configs/TQM862M.h index 2c0cd82..371d19f 100644 --- a/include/configs/TQM862M.h +++ b/include/configs/TQM862M.h @@ -28,7 +28,6 @@ #define CONFIG_8xx_CONS_SMC1 1 /* Console is on SMC1 */ #define CONFIG_SYS_SMC_RXBUFLEN 128 #define CONFIG_SYS_MAXIDLE 10 -#define CONFIG_BAUDRATE 115200 /* console baudrate = 115kbps */ #define CONFIG_BOOTCOUNT_LIMIT diff --git a/include/configs/TQM866M.h b/include/configs/TQM866M.h index a7a1aa8..2906fcf 100644 --- a/include/configs/TQM866M.h +++ b/include/configs/TQM866M.h @@ -39,7 +39,6 @@ #define CONFIG_8xx_CONS_SMC1 1 /* Console is on SMC1 */ #define CONFIG_SYS_SMC_RXBUFLEN 128 #define CONFIG_SYS_MAXIDLE 10 -#define CONFIG_BAUDRATE 115200 /* console baudrate = 115kbps */ #define CONFIG_BOOTCOUNT_LIMIT diff --git a/include/configs/TQM885D.h b/include/configs/TQM885D.h index 6722050..98cec3d 100644 --- a/include/configs/TQM885D.h +++ b/include/configs/TQM885D.h @@ -35,7 +35,6 @@ #define CONFIG_8xx_CONS_SMC1 1 /* Console is on SMC1 */ #define CONFIG_SYS_SMC_RXBUFLEN 128 #define CONFIG_SYS_MAXIDLE 10 -#define CONFIG_BAUDRATE 115200 /* console baudrate = 115kbps */ #define CONFIG_BOOTCOUNT_LIMIT diff --git a/include/configs/UCP1020.h b/include/configs/UCP1020.h index 8082ec5..f1b72a3 100644 --- a/include/configs/UCP1020.h +++ b/include/configs/UCP1020.h @@ -555,8 +555,6 @@ #define CONFIG_BOOTARGS /* the boot command will set bootargs */ -#define CONFIG_BAUDRATE 115200 - #if defined(CONFIG_DONGLE) #define CONFIG_EXTRA_ENV_SETTINGS \ diff --git a/include/configs/VOM405.h b/include/configs/VOM405.h index 760a4be..7e42115 100644 --- a/include/configs/VOM405.h +++ b/include/configs/VOM405.h @@ -24,8 +24,6 @@ #define CONFIG_SYS_CLK_FREQ 33330000 /* external frequency to pll */ -#define CONFIG_BAUDRATE 9600 - #undef CONFIG_BOOTARGS #undef CONFIG_BOOTCOMMAND diff --git a/include/configs/a3m071.h b/include/configs/a3m071.h index a0306ca..60158f9 100644 --- a/include/configs/a3m071.h +++ b/include/configs/a3m071.h @@ -36,7 +36,6 @@ * Serial console configuration */ #define CONFIG_PSC_CONSOLE 1 /* console is on PSC1 */ -#define CONFIG_BAUDRATE 115200 /* ... at 115200 bps */ #define CONFIG_SYS_BAUDRATE_TABLE \ { 9600, 19200, 38400, 57600, 115200, 230400 } diff --git a/include/configs/a4m072.h b/include/configs/a4m072.h index f6bf931..e07a782 100644 --- a/include/configs/a4m072.h +++ b/include/configs/a4m072.h @@ -32,7 +32,6 @@ * Serial console configuration */ #define CONFIG_PSC_CONSOLE 1 /* console is on PSC1 */ -#define CONFIG_BAUDRATE 9600 /* ... at 9600 bps */ #define CONFIG_SYS_BAUDRATE_TABLE { 9600, 19200, 38400, 57600, 115200, 230400 } /* define to enable silent console */ #define CONFIG_SYS_DEVICE_NULLDEV 1 /* include nulldev device */ diff --git a/include/configs/ac14xx.h b/include/configs/ac14xx.h index a7a6bfe..ee015bb 100644 --- a/include/configs/ac14xx.h +++ b/include/configs/ac14xx.h @@ -312,8 +312,6 @@ #error CONFIG_PSC_CONSOLE must be 3 #endif -#define CONFIG_BAUDRATE 115200 /* ... at 115200 bps */ - #define CONSOLE_FIFO_TX_SIZE FIFOC_PSC3_TX_SIZE #define CONSOLE_FIFO_TX_ADDR FIFOC_PSC3_TX_ADDR #define CONSOLE_FIFO_RX_SIZE FIFOC_PSC3_RX_SIZE diff --git a/include/configs/adp-ag101p.h b/include/configs/adp-ag101p.h index a2cdd71..d557c42 100644 --- a/include/configs/adp-ag101p.h +++ b/include/configs/adp-ag101p.h @@ -84,7 +84,6 @@ */ /* FTUART is a high speed NS 16C550A compatible UART, addr: 0x99600000 */ -#define CONFIG_BAUDRATE 38400 #define CONFIG_CONS_INDEX 1 #define CONFIG_SYS_NS16550_SERIAL #define CONFIG_SYS_NS16550_COM1 CONFIG_FTUART010_02_BASE diff --git a/include/configs/advantech_dms-ba16.h b/include/configs/advantech_dms-ba16.h index c05ee1c..14e9c06 100644 --- a/include/configs/advantech_dms-ba16.h +++ b/include/configs/advantech_dms-ba16.h @@ -90,7 +90,6 @@ /* allow to overwrite serial and ethaddr */ #define CONFIG_ENV_OVERWRITE #define CONFIG_CONS_INDEX 1 -#define CONFIG_BAUDRATE 115200 /* Command definition */ #define CONFIG_CMD_BMODE diff --git a/include/configs/am335x_evm.h b/include/configs/am335x_evm.h index 164beb1..2712687 100644 --- a/include/configs/am335x_evm.h +++ b/include/configs/am335x_evm.h @@ -167,7 +167,6 @@ #define CONFIG_SYS_NS16550_COM4 0x481a6000 /* UART3 */ #define CONFIG_SYS_NS16550_COM5 0x481a8000 /* UART4 */ #define CONFIG_SYS_NS16550_COM6 0x481aa000 /* UART5 */ -#define CONFIG_BAUDRATE 115200 #define CONFIG_CMD_EEPROM #define CONFIG_ENV_EEPROM_IS_ON_I2C diff --git a/include/configs/am335x_igep0033.h b/include/configs/am335x_igep0033.h index 7bf1f3b..2b61405 100644 --- a/include/configs/am335x_igep0033.h +++ b/include/configs/am335x_igep0033.h @@ -92,7 +92,6 @@ /* NS16550 Configuration */ #define CONFIG_SYS_NS16550_COM1 0x44e09000 /* UART0 */ #define CONFIG_CONS_INDEX 1 -#define CONFIG_BAUDRATE 115200 /* Ethernet support */ #define CONFIG_PHYLIB diff --git a/include/configs/am335x_shc.h b/include/configs/am335x_shc.h index f676822..c100fbc 100644 --- a/include/configs/am335x_shc.h +++ b/include/configs/am335x_shc.h @@ -243,7 +243,6 @@ #define CONFIG_SYS_NS16550_COM4 0x481a6000 /* UART3 */ #define CONFIG_SYS_NS16550_COM5 0x481a8000 /* UART4 */ #define CONFIG_SYS_NS16550_COM6 0x481aa000 /* UART5 */ -#define CONFIG_BAUDRATE 115200 #define CONFIG_CONS_INDEX 1 /* PMIC support */ diff --git a/include/configs/am335x_sl50.h b/include/configs/am335x_sl50.h index c277450..710dac2 100644 --- a/include/configs/am335x_sl50.h +++ b/include/configs/am335x_sl50.h @@ -63,7 +63,6 @@ #define CONFIG_SYS_NS16550_COM4 0x481a6000 /* UART3 */ #define CONFIG_SYS_NS16550_COM5 0x481a8000 /* UART4 */ #define CONFIG_SYS_NS16550_COM6 0x481aa000 /* UART5 */ -#define CONFIG_BAUDRATE 115200 #define CONFIG_CMD_EEPROM #define CONFIG_ENV_EEPROM_IS_ON_I2C diff --git a/include/configs/am3517_crane.h b/include/configs/am3517_crane.h index 9408759..8be49af 100644 --- a/include/configs/am3517_crane.h +++ b/include/configs/am3517_crane.h @@ -68,7 +68,6 @@ /* allow to overwrite serial and ethaddr */ #define CONFIG_ENV_OVERWRITE -#define CONFIG_BAUDRATE 115200 #define CONFIG_SYS_BAUDRATE_TABLE {4800, 9600, 19200, 38400, 57600,\ 115200} diff --git a/include/configs/am3517_evm.h b/include/configs/am3517_evm.h index f1584e4..7490f2b 100644 --- a/include/configs/am3517_evm.h +++ b/include/configs/am3517_evm.h @@ -65,7 +65,6 @@ /* allow to overwrite serial and ethaddr */ #define CONFIG_ENV_OVERWRITE -#define CONFIG_BAUDRATE 115200 #define CONFIG_SYS_BAUDRATE_TABLE {4800, 9600, 19200, 38400, 57600,\ 115200} diff --git a/include/configs/am57xx_evm.h b/include/configs/am57xx_evm.h index 3d8b996..d545e1b 100644 --- a/include/configs/am57xx_evm.h +++ b/include/configs/am57xx_evm.h @@ -32,7 +32,6 @@ #define CONFIG_SYS_NS16550_COM1 UART1_BASE /* Base EVM has UART0 */ #define CONFIG_SYS_NS16550_COM2 UART2_BASE /* UART2 */ #define CONFIG_SYS_NS16550_COM3 UART3_BASE /* UART3 */ -#define CONFIG_BAUDRATE 115200 #define CONFIG_SYS_OMAP_ABE_SYSCK diff --git a/include/configs/amcc-common.h b/include/configs/amcc-common.h index 7974c53..0f0fe4b 100644 --- a/include/configs/amcc-common.h +++ b/include/configs/amcc-common.h @@ -23,7 +23,6 @@ #define CONFIG_SYS_NS16550_REG_SIZE 1 #define CONFIG_SYS_NS16550_CLK get_serial_clock() #endif -#define CONFIG_BAUDRATE 115200 #define CONFIG_SYS_BAUDRATE_TABLE \ {300, 600, 1200, 2400, 4800, 9600, 19200, 38400, 57600, 115200, 230400} diff --git a/include/configs/amcore.h b/include/configs/amcore.h index 4a54cb6..4f462d6 100644 --- a/include/configs/amcore.h +++ b/include/configs/amcore.h @@ -15,7 +15,6 @@ #define CONFIG_MCFTMR #define CONFIG_MCFUART #define CONFIG_SYS_UART_PORT 0 -#define CONFIG_BAUDRATE 115200 #define CONFIG_SYS_BAUDRATE_TABLE { 9600, 19200, 38400, 57600, 115200 } #define CONFIG_BOOTCOMMAND "bootm ffc20000" diff --git a/include/configs/ap121.h b/include/configs/ap121.h index 88869fa..8ae3c77 100644 --- a/include/configs/ap121.h +++ b/include/configs/ap121.h @@ -24,7 +24,6 @@ #define CONFIG_SYS_INIT_SP_ADDR \ (CONFIG_SYS_INIT_RAM_ADDR + CONFIG_SYS_INIT_RAM_SIZE - 1) -#define CONFIG_BAUDRATE 115200 #define CONFIG_SYS_BAUDRATE_TABLE \ {9600, 19200, 38400, 57600, 115200} diff --git a/include/configs/ap143.h b/include/configs/ap143.h index 4f3742b..a2c31a2 100644 --- a/include/configs/ap143.h +++ b/include/configs/ap143.h @@ -28,7 +28,6 @@ * Serial Port */ #define CONFIG_SYS_NS16550_CLK 25000000 -#define CONFIG_BAUDRATE 115200 #define CONFIG_SYS_BAUDRATE_TABLE \ {9600, 19200, 38400, 57600, 115200} diff --git a/include/configs/ap325rxa.h b/include/configs/ap325rxa.h index 053a184..1cd4d32 100644 --- a/include/configs/ap325rxa.h +++ b/include/configs/ap325rxa.h @@ -16,7 +16,6 @@ #define CONFIG_CMD_SDRAM #define CONFIG_CMD_IDE -#define CONFIG_BAUDRATE 38400 #define CONFIG_BOOTARGS "console=ttySC2,38400" #define CONFIG_DISPLAY_BOARDINFO diff --git a/include/configs/ap_sh4a_4a.h b/include/configs/ap_sh4a_4a.h index c885744..5f5882d 100644 --- a/include/configs/ap_sh4a_4a.h +++ b/include/configs/ap_sh4a_4a.h @@ -19,7 +19,6 @@ #define CONFIG_CMD_SDRAM #define CONFIG_CMD_ENV -#define CONFIG_BAUDRATE 115200 #define CONFIG_BOOTARGS "console=ttySC4,115200" #define CONFIG_DISPLAY_BOARDINFO diff --git a/include/configs/apalis_imx6.h b/include/configs/apalis_imx6.h index c5db7f2..c0c575a 100644 --- a/include/configs/apalis_imx6.h +++ b/include/configs/apalis_imx6.h @@ -10,7 +10,6 @@ #define __CONFIG_H #include "mx6_common.h" -#define CONFIG_SYS_THUMB_BUILD #undef CONFIG_DISPLAY_BOARDINFO #define CONFIG_DISPLAY_BOARDINFO_LATE /* Calls show_board_info() */ @@ -145,7 +144,6 @@ /* allow to overwrite serial and ethaddr */ #define CONFIG_ENV_OVERWRITE #define CONFIG_CONS_INDEX 1 -#define CONFIG_BAUDRATE 115200 /* Command definition */ #undef CONFIG_CMD_LOADB diff --git a/include/configs/apf27.h b/include/configs/apf27.h index 513f9ee..82898bf 100644 --- a/include/configs/apf27.h +++ b/include/configs/apf27.h @@ -200,7 +200,6 @@ */ #define CONFIG_MXC_UART #define CONFIG_CONS_INDEX 1 -#define CONFIG_BAUDRATE 115200 #define CONFIG_MXC_UART_BASE UART1_BASE /* diff --git a/include/configs/aria.h b/include/configs/aria.h index d408d54..94f6605 100644 --- a/include/configs/aria.h +++ b/include/configs/aria.h @@ -309,7 +309,6 @@ #error CONFIG_PSC_CONSOLE must be 3 #endif -#define CONFIG_BAUDRATE 115200 /* ... at 115200 bps */ #define CONFIG_SYS_BAUDRATE_TABLE \ {300, 600, 1200, 2400, 4800, 9600, 19200, 38400,115200} @@ -497,8 +496,6 @@ #undef CONFIG_BOOTARGS /* the boot command will set bootargs */ -#define CONFIG_BAUDRATE 115200 - #define CONFIG_PREBOOT "echo;" \ "echo Type \\\"run flash_nfs\\\" to mount root filesystem over NFS;" \ "echo" diff --git a/include/configs/armadillo-800eva.h b/include/configs/armadillo-800eva.h index 361ada1..7e81c5e 100644 --- a/include/configs/armadillo-800eva.h +++ b/include/configs/armadillo-800eva.h @@ -21,7 +21,6 @@ #define BOARD_LATE_INIT -#define CONFIG_BAUDRATE 115200 #define CONFIG_BOOTARGS "" #undef CONFIG_SHOW_BOOT_PROGRESS diff --git a/include/configs/aspeed-common.h b/include/configs/aspeed-common.h index 93b57d4..f786ffa 100644 --- a/include/configs/aspeed-common.h +++ b/include/configs/aspeed-common.h @@ -43,7 +43,6 @@ /* * NS16550 Configuration */ -#define CONFIG_BAUDRATE 115200 /* * BOOTP options diff --git a/include/configs/astro_mcf5373l.h b/include/configs/astro_mcf5373l.h index e8dca0b..4e3e558 100644 --- a/include/configs/astro_mcf5373l.h +++ b/include/configs/astro_mcf5373l.h @@ -103,8 +103,6 @@ * in u-boot command interface */ -#define CONFIG_BAUDRATE 115200 - #define CONFIG_MCFUART #define CONFIG_SYS_UART_PORT (2) #define CONFIG_SYS_UART2_ALT3_GPIO diff --git a/include/configs/at91-sama5_common.h b/include/configs/at91-sama5_common.h index 42410a8..3e97948 100644 --- a/include/configs/at91-sama5_common.h +++ b/include/configs/at91-sama5_common.h @@ -99,8 +99,6 @@ #endif -#define CONFIG_BAUDRATE 115200 - #define CONFIG_SYS_CBSIZE 256 #define CONFIG_SYS_MAXARGS 16 #define CONFIG_SYS_LONGHELP diff --git a/include/configs/at91rm9200ek.h b/include/configs/at91rm9200ek.h index 9dc3393..53e191a 100644 --- a/include/configs/at91rm9200ek.h +++ b/include/configs/at91rm9200ek.h @@ -110,8 +110,6 @@ #define CONFIG_USART_BASE ATMEL_BASE_DBGU #define CONFIG_USART_ID 0/* ignored in arm */ -#define CONFIG_BAUDRATE 115200 - /* * Command line configuration. */ diff --git a/include/configs/at91sam9260ek.h b/include/configs/at91sam9260ek.h index f12e16c..379f234 100644 --- a/include/configs/at91sam9260ek.h +++ b/include/configs/at91sam9260ek.h @@ -52,7 +52,6 @@ #define CONFIG_ATMEL_USART #define CONFIG_USART_BASE ATMEL_BASE_DBGU #define CONFIG_USART_ID ATMEL_ID_SYS -#define CONFIG_BAUDRATE 115200 /* LED */ #define CONFIG_AT91_LED diff --git a/include/configs/at91sam9261ek.h b/include/configs/at91sam9261ek.h index 263e92b..0afc92c 100644 --- a/include/configs/at91sam9261ek.h +++ b/include/configs/at91sam9261ek.h @@ -44,7 +44,6 @@ #define CONFIG_ATMEL_USART #define CONFIG_USART_BASE ATMEL_BASE_DBGU #define CONFIG_USART_ID ATMEL_ID_SYS -#define CONFIG_BAUDRATE 115200 /* LCD */ #define LCD_BPP LCD_COLOR8 diff --git a/include/configs/at91sam9263ek.h b/include/configs/at91sam9263ek.h index f9d4043..5194131 100644 --- a/include/configs/at91sam9263ek.h +++ b/include/configs/at91sam9263ek.h @@ -52,7 +52,6 @@ #define CONFIG_ATMEL_USART #define CONFIG_USART_BASE ATMEL_BASE_DBGU #define CONFIG_USART_ID ATMEL_ID_SYS -#define CONFIG_BAUDRATE 115200 /* LCD */ #define LCD_BPP LCD_COLOR8 diff --git a/include/configs/at91sam9m10g45ek.h b/include/configs/at91sam9m10g45ek.h index 1ea3231..0708d53 100644 --- a/include/configs/at91sam9m10g45ek.h +++ b/include/configs/at91sam9m10g45ek.h @@ -155,8 +155,6 @@ "bootz 0x72000000 - 0x71000000" #endif -#define CONFIG_BAUDRATE 115200 - #define CONFIG_SYS_CBSIZE 256 #define CONFIG_SYS_MAXARGS 16 #define CONFIG_SYS_LONGHELP diff --git a/include/configs/at91sam9n12ek.h b/include/configs/at91sam9n12ek.h index 339f53f..872d471 100644 --- a/include/configs/at91sam9n12ek.h +++ b/include/configs/at91sam9n12ek.h @@ -35,7 +35,6 @@ #define CONFIG_ATMEL_USART #define CONFIG_USART_BASE ATMEL_BASE_DBGU #define CONFIG_USART_ID ATMEL_ID_SYS -#define CONFIG_BAUDRATE 115200 /* LCD */ #define LCD_BPP LCD_COLOR16 diff --git a/include/configs/at91sam9rlek.h b/include/configs/at91sam9rlek.h index 7fbbd54..8752f1f 100644 --- a/include/configs/at91sam9rlek.h +++ b/include/configs/at91sam9rlek.h @@ -40,7 +40,6 @@ #define CONFIG_ATMEL_USART #define CONFIG_USART_BASE ATMEL_BASE_DBGU #define CONFIG_USART_ID ATMEL_ID_SYS -#define CONFIG_BAUDRATE 115200 /* LCD */ #define LCD_BPP LCD_COLOR8 diff --git a/include/configs/at91sam9x5ek.h b/include/configs/at91sam9x5ek.h index 730b980..c81003e 100644 --- a/include/configs/at91sam9x5ek.h +++ b/include/configs/at91sam9x5ek.h @@ -191,8 +191,6 @@ "rootfstype=ubifs ubi.mtd=7 root=ubi0:rootfs rw" #endif -#define CONFIG_BAUDRATE 115200 - #define CONFIG_SYS_CBSIZE 256 #define CONFIG_SYS_MAXARGS 16 #define CONFIG_SYS_LONGHELP diff --git a/include/configs/atngw100.h b/include/configs/atngw100.h index d966e1c..708f032 100644 --- a/include/configs/atngw100.h +++ b/include/configs/atngw100.h @@ -54,7 +54,6 @@ #define CONFIG_STACKSIZE (2048) -#define CONFIG_BAUDRATE 115200 #define CONFIG_BOOTARGS \ "console=ttyS0 root=/dev/mtdblock1 rootfstype=jffs2" #define CONFIG_BOOTCOMMAND \ diff --git a/include/configs/atngw100mkii.h b/include/configs/atngw100mkii.h index 8a9215e..aa30848 100644 --- a/include/configs/atngw100mkii.h +++ b/include/configs/atngw100mkii.h @@ -73,7 +73,6 @@ #define CONFIG_STACKSIZE (2048) -#define CONFIG_BAUDRATE 115200 #define CONFIG_BOOTARGS \ "root=mtd:main rootfstype=jffs2" #define CONFIG_BOOTCOMMAND \ diff --git a/include/configs/atstk1002.h b/include/configs/atstk1002.h index c9a36bc..771a35a 100644 --- a/include/configs/atstk1002.h +++ b/include/configs/atstk1002.h @@ -71,7 +71,6 @@ #define CONFIG_STACKSIZE (2048) -#define CONFIG_BAUDRATE 115200 #define CONFIG_BOOTARGS \ "console=ttyS0 root=/dev/mmcblk0p1 fbmem=600k rootwait=1" diff --git a/include/configs/axs10x.h b/include/configs/axs10x.h index c055c1a..d60db65 100644 --- a/include/configs/axs10x.h +++ b/include/configs/axs10x.h @@ -52,7 +52,6 @@ #define CONFIG_SYS_NS16550_SERIAL #define CONFIG_SYS_NS16550_CLK 33333333 #define CONFIG_SYS_NS16550_MEM32 -#define CONFIG_BAUDRATE 115200 /* * I2C configuration diff --git a/include/configs/baltos.h b/include/configs/baltos.h index 65c4470..37c71bb 100644 --- a/include/configs/baltos.h +++ b/include/configs/baltos.h @@ -228,7 +228,6 @@ #define CONFIG_SYS_NS16550_COM4 0x481a6000 /* UART3 */ #define CONFIG_SYS_NS16550_COM5 0x481a8000 /* UART4 */ #define CONFIG_SYS_NS16550_COM6 0x481aa000 /* UART5 */ -#define CONFIG_BAUDRATE 115200 #define CONFIG_CMD_EEPROM #define CONFIG_ENV_EEPROM_IS_ON_I2C diff --git a/include/configs/bav335x.h b/include/configs/bav335x.h index fc9dc9c..d5347e6 100644 --- a/include/configs/bav335x.h +++ b/include/configs/bav335x.h @@ -329,7 +329,6 @@ DEFAULT_LINUX_BOOT_ENV \ #define CONFIG_SYS_NS16550_COM4 0x481a6000 /* UART3 */ #define CONFIG_SYS_NS16550_COM5 0x481a8000 /* UART4 */ #define CONFIG_SYS_NS16550_COM6 0x481aa000 /* UART5 */ -#define CONFIG_BAUDRATE 115200 #define CONFIG_CMD_EEPROM #define CONFIG_ENV_EEPROM_IS_ON_I2C diff --git a/include/configs/bcm23550_w1d.h b/include/configs/bcm23550_w1d.h index ce1b89d..65e9e32 100644 --- a/include/configs/bcm23550_w1d.h +++ b/include/configs/bcm23550_w1d.h @@ -81,8 +81,6 @@ #define CONFIG_CONS_INDEX 1 #define CONFIG_SYS_NS16550_COM1 0x3e000000 -#define CONFIG_BAUDRATE 115200 - /* must fit into GPT:u-boot-env partition */ #define CONFIG_ENV_IS_IN_MMC #define CONFIG_SYS_MMC_ENV_DEV 0 diff --git a/include/configs/bcm28155_ap.h b/include/configs/bcm28155_ap.h index 5001ca6..2d9b0a8 100644 --- a/include/configs/bcm28155_ap.h +++ b/include/configs/bcm28155_ap.h @@ -80,8 +80,6 @@ #define CONFIG_CONS_INDEX 1 #define CONFIG_SYS_NS16550_COM1 0x3e000000 -#define CONFIG_BAUDRATE 115200 - /* must fit into GPT:u-boot-env partition */ #define CONFIG_ENV_IS_IN_MMC #define CONFIG_SYS_MMC_ENV_DEV 0 diff --git a/include/configs/bcm_ep_board.h b/include/configs/bcm_ep_board.h index 09b7351..868b0a8 100644 --- a/include/configs/bcm_ep_board.h +++ b/include/configs/bcm_ep_board.h @@ -46,8 +46,6 @@ /* Serial Info */ #define CONFIG_SYS_NS16550_SERIAL -#define CONFIG_BAUDRATE 115200 - #define CONFIG_ENV_SIZE 0x2000 #define CONFIG_ENV_IS_NOWHERE diff --git a/include/configs/bct-brettl2.h b/include/configs/bct-brettl2.h index de60bb1..b965803 100644 --- a/include/configs/bct-brettl2.h +++ b/include/configs/bct-brettl2.h @@ -120,7 +120,6 @@ #define CONFIG_LOADADDR 0x800000 #define CONFIG_MISC_INIT_R #define CONFIG_UART_CONSOLE 0 -#define CONFIG_BAUDRATE 115200 #define CONFIG_MTD_DEVICE #define CONFIG_MTD_PARTITIONS diff --git a/include/configs/bf506f-ezkit.h b/include/configs/bf506f-ezkit.h index 6cad00f..b517af3 100644 --- a/include/configs/bf506f-ezkit.h +++ b/include/configs/bf506f-ezkit.h @@ -80,7 +80,6 @@ #define CONFIG_ICACHE_OFF #define CONFIG_DCACHE_OFF #define CONFIG_UART_CONSOLE 0 -#define CONFIG_BAUDRATE 115200 #define CONFIG_BFIN_SERIAL #undef CONFIG_GZIP diff --git a/include/configs/bf525-ucr2.h b/include/configs/bf525-ucr2.h index b58c1db..1c1a08f 100644 --- a/include/configs/bf525-ucr2.h +++ b/include/configs/bf525-ucr2.h @@ -78,7 +78,6 @@ */ #define CONFIG_UART_CONSOLE 0 -#define CONFIG_BAUDRATE 115200 #define CONFIG_BFIN_SERIAL #define CONFIG_BOOTARGS "root=/dev/mtdblock0 rw" #define CONFIG_BOOTCOMMAND "run sfboot" diff --git a/include/configs/bf537-minotaur.h b/include/configs/bf537-minotaur.h index cabbe37..5d57b80 100644 --- a/include/configs/bf537-minotaur.h +++ b/include/configs/bf537-minotaur.h @@ -114,7 +114,6 @@ #define CONFIG_CMDLINE_EDITING 1 #define CONFIG_ENV_OVERWRITE 1 -#define CONFIG_BAUDRATE 57600 #define CONFIG_UART_CONSOLE 0 #define CONFIG_BFIN_SERIAL diff --git a/include/configs/bf537-pnav.h b/include/configs/bf537-pnav.h index bced1df..6d80592 100644 --- a/include/configs/bf537-pnav.h +++ b/include/configs/bf537-pnav.h @@ -135,7 +135,6 @@ /* * Misc Settings */ -#define CONFIG_BAUDRATE 115200 #define CONFIG_RTC_BFIN #define CONFIG_UART_CONSOLE 0 diff --git a/include/configs/bf537-srv1.h b/include/configs/bf537-srv1.h index 4b23aa8..3b69e58 100644 --- a/include/configs/bf537-srv1.h +++ b/include/configs/bf537-srv1.h @@ -114,7 +114,6 @@ #define CONFIG_CMDLINE_EDITING 1 #define CONFIG_ENV_OVERWRITE 1 -#define CONFIG_BAUDRATE 115200 #define CONFIG_UART_CONSOLE 0 #define CONFIG_BFIN_SERIAL diff --git a/include/configs/bf561-acvilon.h b/include/configs/bf561-acvilon.h index 3a4631e..bf2d7b6 100644 --- a/include/configs/bf561-acvilon.h +++ b/include/configs/bf561-acvilon.h @@ -134,7 +134,6 @@ * Misc Settings */ #define CONFIG_UART_CONSOLE 0 -#define CONFIG_BAUDRATE 57600 /* * Pull in common ADI header for remaining command/environment setup diff --git a/include/configs/bfin_adi_common.h b/include/configs/bfin_adi_common.h index 5d61f99..a915b1a 100644 --- a/include/configs/bfin_adi_common.h +++ b/include/configs/bfin_adi_common.h @@ -75,9 +75,6 @@ #define CONFIG_AUTO_COMPLETE 1 #define CONFIG_LOADS_ECHO 1 #define CONFIG_JTAG_CONSOLE -#ifndef CONFIG_BAUDRATE -# define CONFIG_BAUDRATE 57600 -#endif #ifdef CONFIG_UART_CONSOLE # define CONFIG_BFIN_SERIAL #endif diff --git a/include/configs/blackstamp.h b/include/configs/blackstamp.h index 5044f73..4f65a1d 100644 --- a/include/configs/blackstamp.h +++ b/include/configs/blackstamp.h @@ -172,7 +172,6 @@ /* * Console settings */ -#define CONFIG_BAUDRATE 57600 #define CONFIG_LOADS_ECHO 1 #define CONFIG_UART_CONSOLE 0 #define CONFIG_BFIN_SERIAL diff --git a/include/configs/blackvme.h b/include/configs/blackvme.h index 0b8f4c0..fe823ba 100644 --- a/include/configs/blackvme.h +++ b/include/configs/blackvme.h @@ -160,7 +160,6 @@ /* * Console settings */ -#define CONFIG_BAUDRATE 57600 #define CONFIG_LOADS_ECHO 1 #define CONFIG_UART_CONSOLE 0 #define CONFIG_BFIN_SERIAL diff --git a/include/configs/boston.h b/include/configs/boston.h index aad87c6..1915ad5 100644 --- a/include/configs/boston.h +++ b/include/configs/boston.h @@ -45,7 +45,6 @@ #define CONFIG_SYS_PBSIZE (CONFIG_SYS_CBSIZE + \ sizeof(CONFIG_SYS_PROMPT) + 16) #define CONFIG_SYS_LONGHELP -#define CONFIG_BAUDRATE 115200 /* * Flash diff --git a/include/configs/br4.h b/include/configs/br4.h index 64b379a..8a7a359 100644 --- a/include/configs/br4.h +++ b/include/configs/br4.h @@ -110,7 +110,6 @@ /* * Misc Settings */ -#define CONFIG_BAUDRATE 115200 #define CONFIG_RTC_BFIN #define CONFIG_UART_CONSOLE 0 #define CONFIG_BOOTCOMMAND "run nandboot" diff --git a/include/configs/bur_am335x_common.h b/include/configs/bur_am335x_common.h index 9a39f48..e2da016 100644 --- a/include/configs/bur_am335x_common.h +++ b/include/configs/bur_am335x_common.h @@ -29,7 +29,6 @@ #define CONFIG_SYS_NS16550_REG_SIZE (-4) #define CONFIG_SYS_NS16550_CLK 48000000 #define CONFIG_SYS_NS16550_COM1 0x44e09000 /* UART0 */ -#define CONFIG_BAUDRATE 115200 /* Network defines */ #define CONFIG_DRIVER_TI_CPSW /* Driver for IP block */ diff --git a/include/configs/calimain.h b/include/configs/calimain.h index e990ded..a4ff1e8 100644 --- a/include/configs/calimain.h +++ b/include/configs/calimain.h @@ -153,7 +153,6 @@ #define CONFIG_SYS_NS16550_COM1 DAVINCI_UART2_BASE /* Base address of UART2 */ #define CONFIG_SYS_NS16550_CLK clk_get(DAVINCI_UART2_CLKID) #define CONFIG_CONS_INDEX 1 /* use UART0 for console */ -#define CONFIG_BAUDRATE 115200 /* Default baud rate */ #define CONFIG_ENV_IS_IN_FLASH #define CONFIG_FLASH_CFI_DRIVER diff --git a/include/configs/canmb.h b/include/configs/canmb.h index 684695f..6cd66f2 100644 --- a/include/configs/canmb.h +++ b/include/configs/canmb.h @@ -33,7 +33,6 @@ * Serial console configuration */ #define CONFIG_PSC_CONSOLE 1 /* console is on PSC1 */ -#define CONFIG_BAUDRATE 115200 /* ... at 115200 bps */ #define CONFIG_SYS_BAUDRATE_TABLE { 9600, 19200, 38400, 57600, 115200, 230400 } /* diff --git a/include/configs/chiliboard.h b/include/configs/chiliboard.h index 04ee3a1..c1669fa 100644 --- a/include/configs/chiliboard.h +++ b/include/configs/chiliboard.h @@ -120,7 +120,6 @@ #define CONFIG_SYS_NS16550_COM4 0x481a6000 /* UART3 */ #define CONFIG_SYS_NS16550_COM5 0x481a8000 /* UART4 */ #define CONFIG_SYS_NS16550_COM6 0x481aa000 /* UART5 */ -#define CONFIG_BAUDRATE 115200 /* PMIC support */ #define CONFIG_POWER_TPS65217 diff --git a/include/configs/cl-som-am57x.h b/include/configs/cl-som-am57x.h index e1f724b..a4950f3 100644 --- a/include/configs/cl-som-am57x.h +++ b/include/configs/cl-som-am57x.h @@ -18,7 +18,6 @@ #define CONSOLEDEV "ttyO2" #define CONFIG_SYS_NS16550_COM3 UART3_BASE /* UART3 */ #define CONFIG_CONS_INDEX 3 -#define CONFIG_BAUDRATE 115200 #define CONFIG_SYS_OMAP_ABE_SYSCK diff --git a/include/configs/cm-bf527.h b/include/configs/cm-bf527.h index 0b31dc9..3b6f9ba 100644 --- a/include/configs/cm-bf527.h +++ b/include/configs/cm-bf527.h @@ -109,7 +109,6 @@ /* * Misc Settings */ -#define CONFIG_BAUDRATE 115200 #define CONFIG_MISC_INIT_R #define CONFIG_RTC_BFIN #define CONFIG_UART_CONSOLE 0 diff --git a/include/configs/cm-bf533.h b/include/configs/cm-bf533.h index 7039cba..01a3579 100644 --- a/include/configs/cm-bf533.h +++ b/include/configs/cm-bf533.h @@ -84,7 +84,6 @@ /* * Misc Settings */ -#define CONFIG_BAUDRATE 115200 #define CONFIG_UART_CONSOLE 0 #define CONFIG_BOOTCOMMAND "run flashboot" #define FLASHBOOT_ENV_SETTINGS "flashboot=bootm 0x20040000\0" diff --git a/include/configs/cm-bf537e.h b/include/configs/cm-bf537e.h index cc31a30..d9f91b5 100644 --- a/include/configs/cm-bf537e.h +++ b/include/configs/cm-bf537e.h @@ -123,7 +123,6 @@ /* * Misc Settings */ -#define CONFIG_BAUDRATE 115200 #define CONFIG_MISC_INIT_R #define CONFIG_RTC_BFIN #define CONFIG_UART_CONSOLE 0 diff --git a/include/configs/cm-bf537u.h b/include/configs/cm-bf537u.h index 282eb4f..af11ebe 100644 --- a/include/configs/cm-bf537u.h +++ b/include/configs/cm-bf537u.h @@ -121,7 +121,6 @@ /* * Misc Settings */ -#define CONFIG_BAUDRATE 115200 #define CONFIG_MISC_INIT_R #define CONFIG_RTC_BFIN #define CONFIG_UART_CONSOLE 0 diff --git a/include/configs/cm-bf548.h b/include/configs/cm-bf548.h index 02a46ca..10e8efd 100644 --- a/include/configs/cm-bf548.h +++ b/include/configs/cm-bf548.h @@ -101,7 +101,6 @@ /* * Misc Settings */ -#define CONFIG_BAUDRATE 115200 #define CONFIG_RTC_BFIN #define CONFIG_UART_CONSOLE 1 #define CONFIG_BOOTCOMMAND "run flashboot" diff --git a/include/configs/cm-bf561.h b/include/configs/cm-bf561.h index 3860e0e..ac1646c 100644 --- a/include/configs/cm-bf561.h +++ b/include/configs/cm-bf561.h @@ -86,7 +86,6 @@ /* * Misc Settings */ -#define CONFIG_BAUDRATE 115200 #define CONFIG_UART_CONSOLE 0 #define CONFIG_BOOTCOMMAND "run flashboot" #define FLASHBOOT_ENV_SETTINGS "flashboot=bootm 0x20040000\0" diff --git a/include/configs/cm5200.h b/include/configs/cm5200.h index b3a98df..51a5f6d 100644 --- a/include/configs/cm5200.h +++ b/include/configs/cm5200.h @@ -31,7 +31,6 @@ * Serial console configuration */ #define CONFIG_PSC_CONSOLE 1 /* console is on PSC1 */ -#define CONFIG_BAUDRATE 57600 /* ... at 57600 bps */ #define CONFIG_SYS_BAUDRATE_TABLE { 9600, 19200, 38400, 57600, 115200, 230400 } /* diff --git a/include/configs/cm_fx6.h b/include/configs/cm_fx6.h index 0dad9c3..45511be 100644 --- a/include/configs/cm_fx6.h +++ b/include/configs/cm_fx6.h @@ -41,7 +41,6 @@ /* Serial console */ #define CONFIG_MXC_UART #define CONFIG_MXC_UART_BASE UART4_BASE -#define CONFIG_BAUDRATE 115200 #define CONFIG_SYS_BAUDRATE_TABLE {9600, 19200, 38400, 57600, 115200} /* Shell */ diff --git a/include/configs/cm_t335.h b/include/configs/cm_t335.h index 2898f47..69137bc 100644 --- a/include/configs/cm_t335.h +++ b/include/configs/cm_t335.h @@ -92,7 +92,6 @@ /* NS16550 Configuration */ #define CONFIG_SYS_NS16550_COM1 0x44e09000 /* UART0 */ #define CONFIG_SYS_NS16550_COM2 0x48022000 /* UART1 */ -#define CONFIG_BAUDRATE 115200 /* I2C Configuration */ #define CONFIG_SYS_I2C_EEPROM_ADDR 0x50 /* Main EEPROM */ diff --git a/include/configs/cm_t35.h b/include/configs/cm_t35.h index e8b79a2..8e6571b 100644 --- a/include/configs/cm_t35.h +++ b/include/configs/cm_t35.h @@ -72,7 +72,6 @@ /* allow to overwrite serial and ethaddr */ #define CONFIG_ENV_OVERWRITE -#define CONFIG_BAUDRATE 115200 #define CONFIG_SYS_BAUDRATE_TABLE {4800, 9600, 19200, 38400, 57600,\ 115200} diff --git a/include/configs/cm_t3517.h b/include/configs/cm_t3517.h index c179a2b..55d4786 100644 --- a/include/configs/cm_t3517.h +++ b/include/configs/cm_t3517.h @@ -77,7 +77,6 @@ /* allow to overwrite serial and ethaddr */ #define CONFIG_ENV_OVERWRITE -#define CONFIG_BAUDRATE 115200 #define CONFIG_SYS_BAUDRATE_TABLE {4800, 9600, 19200, 38400, 57600,\ 115200} diff --git a/include/configs/cm_t54.h b/include/configs/cm_t54.h index 952538d..477aa07 100644 --- a/include/configs/cm_t54.h +++ b/include/configs/cm_t54.h @@ -28,7 +28,6 @@ /* UART setup */ #define CONFIG_CONS_INDEX 4 #define CONFIG_SYS_NS16550_COM4 UART4_BASE -#define CONFIG_BAUDRATE 115200 /* MMC ENV related defines */ #undef CONFIG_ENV_OFFSET diff --git a/include/configs/cobra5272.h b/include/configs/cobra5272.h index 0e8d4ac..b078e10 100644 --- a/include/configs/cobra5272.h +++ b/include/configs/cobra5272.h @@ -52,7 +52,6 @@ #define CONFIG_MCFUART #define CONFIG_SYS_UART_PORT (0) -#define CONFIG_BAUDRATE 19200 /* --- * set "#if 0" to "#if 1" if (Hardware)-WATCHDOG should be enabled & change diff --git a/include/configs/colibri_imx6.h b/include/configs/colibri_imx6.h index 924b40f..0b58e5b 100644 --- a/include/configs/colibri_imx6.h +++ b/include/configs/colibri_imx6.h @@ -10,7 +10,6 @@ #define __CONFIG_H #include "mx6_common.h" -#define CONFIG_SYS_THUMB_BUILD #undef CONFIG_DISPLAY_BOARDINFO #define CONFIG_DISPLAY_BOARDINFO_LATE /* Calls show_board_info() */ @@ -126,7 +125,6 @@ /* allow to overwrite serial and ethaddr */ #define CONFIG_ENV_OVERWRITE #define CONFIG_CONS_INDEX 1 -#define CONFIG_BAUDRATE 115200 /* Command definition */ #undef CONFIG_CMD_LOADB diff --git a/include/configs/colibri_imx7.h b/include/configs/colibri_imx7.h index a0b18d2..2c9c014 100644 --- a/include/configs/colibri_imx7.h +++ b/include/configs/colibri_imx7.h @@ -14,8 +14,6 @@ #include "mx7_common.h" -#define CONFIG_SYS_THUMB_BUILD - /*#define CONFIG_DBG_MONITOR*/ #define PHYS_SDRAM_SIZE SZ_512M diff --git a/include/configs/colibri_pxa270.h b/include/configs/colibri_pxa270.h index 4f05fab..015f982 100644 --- a/include/configs/colibri_pxa270.h +++ b/include/configs/colibri_pxa270.h @@ -47,7 +47,6 @@ /* * Serial Console Configuration */ -#define CONFIG_BAUDRATE 115200 /* * Bootloader Components Configuration diff --git a/include/configs/colibri_vf.h b/include/configs/colibri_vf.h index 6d05f93..888899e 100644 --- a/include/configs/colibri_vf.h +++ b/include/configs/colibri_vf.h @@ -14,7 +14,6 @@ #include <asm/arch/imx-regs.h> -#define CONFIG_SYS_THUMB_BUILD #define CONFIG_SYS_FSL_CLK #define CONFIG_DISPLAY_BOARDINFO_LATE /* Calls show_board_info() */ @@ -33,7 +32,6 @@ #define CONFIG_ENV_OVERWRITE #define CONFIG_ENV_VARS_UBOOT_CONFIG #define CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG -#define CONFIG_BAUDRATE 115200 /* NAND support */ #define CONFIG_CMD_NAND diff --git a/include/configs/controlcenterd.h b/include/configs/controlcenterd.h index 5bd66d8..1bd3195 100644 --- a/include/configs/controlcenterd.h +++ b/include/configs/controlcenterd.h @@ -384,9 +384,6 @@ */ #ifdef CONFIG_TRAILBLAZER - -#define CONFIG_BAUDRATE 115200 - #define CONFIG_EXTRA_ENV_SETTINGS \ "mp_holdoff=1\0" @@ -399,9 +396,6 @@ #define CONFIG_LOADADDR 1000000 - -#define CONFIG_BAUDRATE 115200 - #define CONFIG_EXTRA_ENV_SETTINGS \ "netdev=eth0\0" \ "uboot=" __stringify(CONFIG_UBOOTPATH) "\0" \ diff --git a/include/configs/corenet_ds.h b/include/configs/corenet_ds.h index f810d34..f42ba79 100644 --- a/include/configs/corenet_ds.h +++ b/include/configs/corenet_ds.h @@ -663,9 +663,6 @@ /* default location for tftp and bootm */ #define CONFIG_LOADADDR 1000000 - -#define CONFIG_BAUDRATE 115200 - #ifdef CONFIG_TARGET_P4080DS #define __USB_PHY_TYPE ulpi #else diff --git a/include/configs/corvus.h b/include/configs/corvus.h index 3a01a2b..bb1d0d7 100644 --- a/include/configs/corvus.h +++ b/include/configs/corvus.h @@ -127,8 +127,6 @@ "512k(dtb),6M(kernel)ro,-(rootfs) " \ "root=/dev/mtdblock7 rw rootfstype=jffs2" -#define CONFIG_BAUDRATE 115200 - #define CONFIG_SYS_CBSIZE 256 #define CONFIG_SYS_MAXARGS 16 #define CONFIG_SYS_PBSIZE (CONFIG_SYS_CBSIZE + \ diff --git a/include/configs/cyrus.h b/include/configs/cyrus.h index 0f0a075..dfeee51 100644 --- a/include/configs/cyrus.h +++ b/include/configs/cyrus.h @@ -479,9 +479,6 @@ /* default location for tftp and bootm */ #define CONFIG_LOADADDR 1000000 - -#define CONFIG_BAUDRATE 115200 - #define __USB_PHY_TYPE utmi #define CONFIG_EXTRA_ENV_SETTINGS \ diff --git a/include/configs/da850evm.h b/include/configs/da850evm.h index 42f54ef..3ce9058 100644 --- a/include/configs/da850evm.h +++ b/include/configs/da850evm.h @@ -135,7 +135,6 @@ #define CONFIG_SYS_NS16550_COM1 DAVINCI_UART2_BASE /* Base address of UART2 */ #define CONFIG_SYS_NS16550_CLK clk_get(DAVINCI_UART2_CLKID) #define CONFIG_CONS_INDEX 1 /* use UART0 for console */ -#define CONFIG_BAUDRATE 115200 /* Default baud rate */ #define CONFIG_SPI #define CONFIG_DAVINCI_SPI diff --git a/include/configs/dbau1x00.h b/include/configs/dbau1x00.h index ad7667e..0437296 100644 --- a/include/configs/dbau1x00.h +++ b/include/configs/dbau1x00.h @@ -35,9 +35,6 @@ #endif #endif - -#define CONFIG_BAUDRATE 115200 - /* valid baudrates */ #define CONFIG_TIMESTAMP /* Print image info with timestamp */ diff --git a/include/configs/devkit3250.h b/include/configs/devkit3250.h index 9c7afa5..6e95064 100644 --- a/include/configs/devkit3250.h +++ b/include/configs/devkit3250.h @@ -41,7 +41,6 @@ * Serial Driver */ #define CONFIG_SYS_LPC32XX_UART 5 /* UART5 */ -#define CONFIG_BAUDRATE 115200 /* * DMA diff --git a/include/configs/digsy_mtc.h b/include/configs/digsy_mtc.h index d6803c5..71068a8 100644 --- a/include/configs/digsy_mtc.h +++ b/include/configs/digsy_mtc.h @@ -41,7 +41,6 @@ * Serial console configuration */ #define CONFIG_PSC_CONSOLE 4 /* console is on PSC4 */ -#define CONFIG_BAUDRATE 115200 /* ... at 115200 bps */ #define CONFIG_SYS_BAUDRATE_TABLE \ { 9600, 19200, 38400, 57600, 115200, 230400 } diff --git a/include/configs/dnp5370.h b/include/configs/dnp5370.h index 0a7bc8a..1690dda 100644 --- a/include/configs/dnp5370.h +++ b/include/configs/dnp5370.h @@ -101,7 +101,6 @@ #define CONFIG_UART_CONSOLE 0 #define CONFIG_BFIN_SERIAL -#define CONFIG_BAUDRATE 115200 #define CONFIG_BOOTCOMMAND "bootm 0x20030000" #define CONFIG_BOOTARGS "console=ttyBF0,115200 root=/dev/mtdblock3 rootfstype=ext2" diff --git a/include/configs/dra7xx_evm.h b/include/configs/dra7xx_evm.h index 549439e..43e74a2 100644 --- a/include/configs/dra7xx_evm.h +++ b/include/configs/dra7xx_evm.h @@ -42,7 +42,6 @@ #define CONFIG_SYS_NS16550_COM1 UART1_BASE /* Base EVM has UART0 */ #define CONFIG_SYS_NS16550_COM2 UART2_BASE /* UART2 */ #define CONFIG_SYS_NS16550_COM3 UART3_BASE /* UART3 */ -#define CONFIG_BAUDRATE 115200 #define CONFIG_SYS_OMAP_ABE_SYSCK diff --git a/include/configs/dragonboard410c.h b/include/configs/dragonboard410c.h index 7f0742a..b97c6c4 100644 --- a/include/configs/dragonboard410c.h +++ b/include/configs/dragonboard410c.h @@ -26,7 +26,6 @@ #define CONFIG_SYS_BOOTM_LEN 0x1000000 /* 16MB max kernel size */ /* UART */ -#define CONFIG_BAUDRATE 115200 /* Generic Timer Definitions */ #define COUNTER_FREQUENCY 19000000 @@ -46,12 +45,8 @@ #define CONFIG_USB_ETHER_MCS7830 #define CONFIG_USB_ETHER_SMSC95XX -/* Libraries */ -#define CONFIG_MD5 - /* Extra Commands */ #define CONFIG_CMD_ENV -#define CONFIG_CMD_MD5SUM /* Enable that for switching of boot partitions */ /* Disabled by default as some sub-commands can brick eMMC */ /*#define CONFIG_SUPPORT_EMMC_BOOT */ diff --git a/include/configs/ea20.h b/include/configs/ea20.h index a9eb6bc..a7b2dc8 100644 --- a/include/configs/ea20.h +++ b/include/configs/ea20.h @@ -59,7 +59,6 @@ #define CONFIG_SYS_NS16550_COM1 DAVINCI_UART0_BASE /* Base address of UART0 */ #define CONFIG_SYS_NS16550_CLK clk_get(DAVINCI_UART2_CLKID) #define CONFIG_CONS_INDEX 1 /* use UART0 for console */ -#define CONFIG_BAUDRATE 115200 /* Default baud rate */ #define CONFIG_SPI #define CONFIG_DAVINCI_SPI diff --git a/include/configs/eb_cpu5282.h b/include/configs/eb_cpu5282.h index dc08db6..edd9485 100644 --- a/include/configs/eb_cpu5282.h +++ b/include/configs/eb_cpu5282.h @@ -19,7 +19,6 @@ #define CONFIG_MCFUART #define CONFIG_SYS_UART_PORT (0) -#define CONFIG_BAUDRATE 115200 #undef CONFIG_MONITOR_IS_IN_RAM /* starts uboot direct */ diff --git a/include/configs/ecovec.h b/include/configs/ecovec.h index 591028e..f8fb97b 100644 --- a/include/configs/ecovec.h +++ b/include/configs/ecovec.h @@ -31,7 +31,6 @@ #define CONFIG_CMD_SDRAM #define CONFIG_CMD_ENV -#define CONFIG_BAUDRATE 115200 #define CONFIG_BOOTARGS "console=ttySC0,115200" #define CONFIG_DISPLAY_BOARDINFO diff --git a/include/configs/edb93xx.h b/include/configs/edb93xx.h index 774d329..99f0dae 100644 --- a/include/configs/edb93xx.h +++ b/include/configs/edb93xx.h @@ -91,7 +91,6 @@ /* Serial port hardware configuration */ #define CONFIG_PL010_SERIAL #define CONFIG_CONS_INDEX 0 -#define CONFIG_BAUDRATE 115200 #define CONFIG_SYS_BAUDRATE_TABLE {9600, 19200, 38400, 57600, \ 115200, 230400} #define CONFIG_SYS_SERIAL0 0x808C0000 diff --git a/include/configs/edminiv2.h b/include/configs/edminiv2.h index 175adbd..f7ac302 100644 --- a/include/configs/edminiv2.h +++ b/include/configs/edminiv2.h @@ -90,7 +90,6 @@ */ #define CONFIG_CONS_INDEX 1 /*Console on UART0 */ -#define CONFIG_BAUDRATE 115200 #define CONFIG_SYS_BAUDRATE_TABLE \ { 9600, 19200, 38400, 57600, 115200, 230400, 460800, 921600 } diff --git a/include/configs/el6x_common.h b/include/configs/el6x_common.h index 2f4219f..afb5b73 100644 --- a/include/configs/el6x_common.h +++ b/include/configs/el6x_common.h @@ -55,7 +55,6 @@ /* allow to overwrite serial and ethaddr */ #define CONFIG_ENV_OVERWRITE #define CONFIG_MXC_UART_BASE UART2_BASE -#define CONFIG_BAUDRATE 115200 /* Command definition */ diff --git a/include/configs/espt.h b/include/configs/espt.h index 9475740..ace7186 100644 --- a/include/configs/espt.h +++ b/include/configs/espt.h @@ -28,7 +28,6 @@ /* SCIF */ #define CONFIG_SCIF_CONSOLE 1 -#define CONFIG_BAUDRATE 115200 #define CONFIG_CONS_SCIF0 1 #define CONFIG_SYS_TEXT_BASE 0x8FFC0000 diff --git a/include/configs/ethernut5.h b/include/configs/ethernut5.h index 55d65ef..b83eb45 100644 --- a/include/configs/ethernut5.h +++ b/include/configs/ethernut5.h @@ -77,7 +77,6 @@ /* Serial port */ #define CONFIG_ATMEL_USART #define CONFIG_USART3 /* USART 3 is DBGU */ -#define CONFIG_BAUDRATE 115200 #define CONFIG_USART_BASE ATMEL_BASE_DBGU #define CONFIG_USART_ID ATMEL_ID_SYS diff --git a/include/configs/evb_rk3328.h b/include/configs/evb_rk3328.h new file mode 100644 index 0000000..3a39a1b --- /dev/null +++ b/include/configs/evb_rk3328.h @@ -0,0 +1,26 @@ +/* + * (C) Copyright 2016 Rockchip Electronics Co., Ltd + * + * SPDX-License-Identifier: GPL-2.0+ + */ + +#ifndef __EVB_RK3328_H +#define __EVB_RK3328_H + +#include <configs/rk3328_common.h> + +#define CONFIG_ENV_IS_IN_MMC +#define CONFIG_SYS_MMC_ENV_DEV 1 +/* + * SPL @ 32k for ~36k + * ENV @ 96k + * u-boot @ 128K + */ +#define CONFIG_ENV_OFFSET (96 * 1024) + +#define SDRAM_BANK_SIZE (2UL << 30) + +#define CONFIG_SYS_WHITE_ON_BLACK +#define CONFIG_CONSOLE_SCROLL_LINES 10 + +#endif diff --git a/include/configs/exynos-common.h b/include/configs/exynos-common.h index 7a40c98..b4f7530 100644 --- a/include/configs/exynos-common.h +++ b/include/configs/exynos-common.h @@ -34,7 +34,6 @@ #define CONFIG_SYS_MALLOC_LEN (CONFIG_ENV_SIZE + (80 << 20)) /* select serial console configuration */ -#define CONFIG_BAUDRATE 115200 /* SD/MMC configuration */ #define CONFIG_BOUNCE_BUFFER diff --git a/include/configs/exynos5-common.h b/include/configs/exynos5-common.h index 12ceb2c..5411e5f 100644 --- a/include/configs/exynos5-common.h +++ b/include/configs/exynos5-common.h @@ -40,7 +40,6 @@ #define INFORM3_OFFSET 0x80c /* select serial console configuration */ -#define CONFIG_BAUDRATE 115200 #define EXYNOS5_DEFAULT_UART_OFFSET 0x010000 #define CONFIG_CMD_HASH diff --git a/include/configs/exynos7420-common.h b/include/configs/exynos7420-common.h index 8226543..b4b034f 100644 --- a/include/configs/exynos7420-common.h +++ b/include/configs/exynos7420-common.h @@ -31,7 +31,6 @@ #define CONFIG_SYS_BARGSIZE CONFIG_SYS_CBSIZE /* select serial console configuration */ -#define CONFIG_BAUDRATE 115200 /* Timer input clock frequency */ #define COUNTER_FREQUENCY 24000000 @@ -49,7 +48,6 @@ #define CONFIG_CORE_COUNT 0x8 /* select serial console configuration */ -#define CONFIG_BAUDRATE 115200 #define CONFIG_SYS_LOAD_ADDR (CONFIG_SYS_SDRAM_BASE + 0x3E00000) diff --git a/include/configs/flea3.h b/include/configs/flea3.h index fa2fcb1..0ab3395 100644 --- a/include/configs/flea3.h +++ b/include/configs/flea3.h @@ -59,7 +59,6 @@ /* allow to overwrite serial and ethaddr */ #define CONFIG_ENV_OVERWRITE #define CONFIG_CONS_INDEX 1 -#define CONFIG_BAUDRATE 115200 /* * Command definition diff --git a/include/configs/ge_bx50v3.h b/include/configs/ge_bx50v3.h index d8af90d..f86e20c 100644 --- a/include/configs/ge_bx50v3.h +++ b/include/configs/ge_bx50v3.h @@ -113,7 +113,6 @@ /* allow to overwrite serial and ethaddr */ #define CONFIG_ENV_OVERWRITE #define CONFIG_CONS_INDEX 1 -#define CONFIG_BAUDRATE 115200 /* Command definition */ #define CONFIG_CMD_BMODE diff --git a/include/configs/gr_cpci_ax2000.h b/include/configs/gr_cpci_ax2000.h index c265555..2c8adab 100644 --- a/include/configs/gr_cpci_ax2000.h +++ b/include/configs/gr_cpci_ax2000.h @@ -45,7 +45,6 @@ /* * Serial console configuration */ -#define CONFIG_BAUDRATE 38400 /* ... at 38400 bps */ #define CONFIG_SYS_BAUDRATE_TABLE { 9600, 19200, 38400, 57600, 115200, 230400 } /* Partitions */ diff --git a/include/configs/gr_ep2s60.h b/include/configs/gr_ep2s60.h index 0d513c5..2edb1b0 100644 --- a/include/configs/gr_ep2s60.h +++ b/include/configs/gr_ep2s60.h @@ -39,7 +39,6 @@ /* * Serial console configuration */ -#define CONFIG_BAUDRATE 38400 /* ... at 38400 bps */ #define CONFIG_SYS_BAUDRATE_TABLE { 9600, 19200, 38400, 57600, 115200, 230400 } /* Partitions */ diff --git a/include/configs/gr_xc3s_1500.h b/include/configs/gr_xc3s_1500.h index 20eeab3..b8ac7d1 100644 --- a/include/configs/gr_xc3s_1500.h +++ b/include/configs/gr_xc3s_1500.h @@ -26,7 +26,6 @@ /* * Serial console configuration */ -#define CONFIG_BAUDRATE 38400 /* ... at 38400 bps */ #define CONFIG_SYS_BAUDRATE_TABLE { 9600, 19200, 38400, 57600, 115200, 230400 } /* Partitions */ diff --git a/include/configs/grasshopper.h b/include/configs/grasshopper.h index b727314..d7b9c18 100644 --- a/include/configs/grasshopper.h +++ b/include/configs/grasshopper.h @@ -71,8 +71,6 @@ #define CONFIG_STACKSIZE (2048) -#define CONFIG_BAUDRATE 115200 - /* * After booting the board for the first time, new ethernet addresses diff --git a/include/configs/grsim.h b/include/configs/grsim.h index 18b8d3c..4594b13 100644 --- a/include/configs/grsim.h +++ b/include/configs/grsim.h @@ -37,7 +37,6 @@ /* * Serial console configuration */ -#define CONFIG_BAUDRATE 38400 /* ... at 38400 bps */ #define CONFIG_SYS_BAUDRATE_TABLE { 9600, 19200, 38400, 57600, 115200, 230400 } /* Partitions */ diff --git a/include/configs/grsim_leon2.h b/include/configs/grsim_leon2.h index ba570c3..ea9e3e8 100644 --- a/include/configs/grsim_leon2.h +++ b/include/configs/grsim_leon2.h @@ -32,7 +32,6 @@ /* * Serial console configuration */ -#define CONFIG_BAUDRATE 38400 /* ... at 38400 bps */ #define CONFIG_SYS_BAUDRATE_TABLE { 9600, 19200, 38400, 57600, 115200, 230400 } /* Partitions */ diff --git a/include/configs/h2200.h b/include/configs/h2200.h index 0891b02..d8724f8 100644 --- a/include/configs/h2200.h +++ b/include/configs/h2200.h @@ -107,7 +107,6 @@ #define CONFIG_FFUART #define CONFIG_CONS_INDEX 3 -#define CONFIG_BAUDRATE 115200 #define CONFIG_SYS_BAUDRATE_TABLE { 9600, 38400, 115200 } #define CONFIG_FIT_DISABLE_SHA256 diff --git a/include/configs/highbank.h b/include/configs/highbank.h index b47624a..e15b572 100644 --- a/include/configs/highbank.h +++ b/include/configs/highbank.h @@ -10,7 +10,6 @@ #include <config_distro_defaults.h> #define CONFIG_SYS_DCACHE_OFF -#define CONFIG_SYS_THUMB_BUILD #define CONFIG_SYS_BOOTMAPSZ (16 << 20) @@ -28,8 +27,6 @@ #define CONFIG_PL01x_PORTS { (void *)(0xFFF36000) } #define CONFIG_CONS_INDEX 0 -#define CONFIG_BAUDRATE 115200 - #define CONFIG_BOOTCOUNT_LIMIT #define CONFIG_SYS_BOOTCOUNT_SINGLEWORD #define CONFIG_SYS_BOOTCOUNT_LE /* Use little-endian accessors */ diff --git a/include/configs/hikey.h b/include/configs/hikey.h index d3492d5..4cdb27c 100644 --- a/include/configs/hikey.h +++ b/include/configs/hikey.h @@ -52,7 +52,6 @@ /* Serial port PL010/PL011 through the device model */ #define CONFIG_PL01X_SERIAL -#define CONFIG_BAUDRATE 115200 #ifdef CONFIG_CMD_USB #define CONFIG_USB_DWC2 diff --git a/include/configs/hrcon.h b/include/configs/hrcon.h index 9f5029a..5574e77 100644 --- a/include/configs/hrcon.h +++ b/include/configs/hrcon.h @@ -596,8 +596,6 @@ void fpga_control_clear(unsigned int bus, int pin); #define CONFIG_HAS_ETH0 #endif -#define CONFIG_BAUDRATE 115200 - #define CONFIG_LOADADDR 800000 /* default location for tftp and bootm */ diff --git a/include/configs/ids8313.h b/include/configs/ids8313.h index 112e885..e2c2552 100644 --- a/include/configs/ids8313.h +++ b/include/configs/ids8313.h @@ -449,8 +449,6 @@ #define CONFIG_CMD_ENV_FLAGS #define CONFIG_ENV_FLAGS_LIST_STATIC "ethaddr:mo,eth1addr:mo" -#define CONFIG_BAUDRATE 115200 - /* Initial Memory map for Linux*/ #define CONFIG_SYS_BOOTMAPSZ (256 << 20) diff --git a/include/configs/imgtec_xilfpga.h b/include/configs/imgtec_xilfpga.h index e5f682c..6310423 100644 --- a/include/configs/imgtec_xilfpga.h +++ b/include/configs/imgtec_xilfpga.h @@ -47,7 +47,6 @@ */ #define CONFIG_SYS_CBSIZE 1024 /* Console I/O Buffer Size */ #define CONFIG_SYS_MAXARGS 16 /* max number of command args*/ -#define CONFIG_BAUDRATE 115200 /* ------------------------------------------------- * Environment diff --git a/include/configs/imx27lite-common.h b/include/configs/imx27lite-common.h index cbd1dbc..db745b2 100644 --- a/include/configs/imx27lite-common.h +++ b/include/configs/imx27lite-common.h @@ -85,7 +85,6 @@ #define CONFIG_MXC_UART #define CONFIG_MXC_UART_BASE UART1_BASE #define CONFIG_CONS_INDEX 1 /* use UART0 for console */ -#define CONFIG_BAUDRATE 115200 /* Default baud rate */ /* * Flash & Environment diff --git a/include/configs/imx31_phycore.h b/include/configs/imx31_phycore.h index 5d0702f..ae5009a 100644 --- a/include/configs/imx31_phycore.h +++ b/include/configs/imx31_phycore.h @@ -44,7 +44,6 @@ /* allow to overwrite serial and ethaddr */ #define CONFIG_ENV_OVERWRITE #define CONFIG_CONS_INDEX 1 -#define CONFIG_BAUDRATE 115200 /*********************************************************** * Command definition diff --git a/include/configs/imx6_spl.h b/include/configs/imx6_spl.h index c5a035f..4598d27 100644 --- a/include/configs/imx6_spl.h +++ b/include/configs/imx6_spl.h @@ -24,7 +24,6 @@ * and some padding thus 'our' max size is really 0x00908000 - 0x00918000 * or 64KB */ -#define CONFIG_SYS_THUMB_BUILD #define CONFIG_SPL_LDSCRIPT "arch/arm/mach-omap2/u-boot-spl.lds" #define CONFIG_SPL_TEXT_BASE 0x00908000 #define CONFIG_SPL_MAX_SIZE 0x10000 @@ -45,14 +44,12 @@ #if defined(CONFIG_SPL_MMC_SUPPORT) #define CONFIG_SYS_MMCSD_FS_BOOT_PARTITION 1 #define CONFIG_SYS_MONITOR_LEN 409600 /* 400 KB */ -#define CONFIG_SPL_ABORT_ON_RAW_IMAGE #endif /* SATA support */ #if defined(CONFIG_SPL_SATA_SUPPORT) #define CONFIG_SPL_SATA_BOOT_DEVICE 0 #define CONFIG_SYS_SATA_FAT_BOOT_PARTITION 1 -#define CONFIG_SPL_ABORT_ON_RAW_IMAGE #endif /* Define the payload for FAT/EXT support */ diff --git a/include/configs/inka4x0.h b/include/configs/inka4x0.h index b2131e8..c3e1cae 100644 --- a/include/configs/inka4x0.h +++ b/include/configs/inka4x0.h @@ -39,7 +39,6 @@ * Serial console configuration */ #define CONFIG_PSC_CONSOLE 1 /* console is on PSC1 */ -#define CONFIG_BAUDRATE 115200 /* ... at 115200 bps */ #define CONFIG_SYS_BAUDRATE_TABLE { 9600, 19200, 38400, 57600, 115200, 230400 } /* diff --git a/include/configs/integrator-common.h b/include/configs/integrator-common.h index b95851a..dca60df 100644 --- a/include/configs/integrator-common.h +++ b/include/configs/integrator-common.h @@ -21,7 +21,6 @@ /* Serial port PL010/PL011 through the device model */ #define CONFIG_PL01X_SERIAL -#define CONFIG_BAUDRATE 38400 #define CONFIG_CONS_INDEX 0 #define CONFIG_CMDLINE_TAG /* enable passing of ATAGs */ diff --git a/include/configs/ip04.h b/include/configs/ip04.h index ff8d432..1531feb 100644 --- a/include/configs/ip04.h +++ b/include/configs/ip04.h @@ -116,7 +116,6 @@ /* * Misc Settings */ -#define CONFIG_BAUDRATE 115200 #define CONFIG_UART_CONSOLE 0 #undef CONFIG_SHOW_BOOT_PROGRESS diff --git a/include/configs/ipam390.h b/include/configs/ipam390.h index d031622..41e7dca 100644 --- a/include/configs/ipam390.h +++ b/include/configs/ipam390.h @@ -134,7 +134,6 @@ #define CONFIG_SYS_NS16550_COM1 DAVINCI_UART0_BASE /* Base address of UART0 */ #define CONFIG_SYS_NS16550_CLK clk_get(DAVINCI_UART2_CLKID) #define CONFIG_CONS_INDEX 1 /* use UART0 for console */ -#define CONFIG_BAUDRATE 115200 /* Default baud rate */ /* * Flash & Environment diff --git a/include/configs/ipek01.h b/include/configs/ipek01.h index 1aeded1..a99e928 100644 --- a/include/configs/ipek01.h +++ b/include/configs/ipek01.h @@ -35,7 +35,6 @@ * Serial console configuration */ #define CONFIG_PSC_CONSOLE 1 /* console is on PSC1 */ -#define CONFIG_BAUDRATE 115200 /* ... at 9600 bps */ #define CONFIG_SYS_BAUDRATE_TABLE { 9600, 19200, 38400, 57600, 115200, 230400 } #define CONFIG_CMDLINE_EDITING 1 /* add command line history */ diff --git a/include/configs/jupiter.h b/include/configs/jupiter.h index 44345dd..0d97317 100644 --- a/include/configs/jupiter.h +++ b/include/configs/jupiter.h @@ -35,7 +35,6 @@ * Serial console configuration */ #define CONFIG_PSC_CONSOLE 1 /* console is on PSC1 */ -#define CONFIG_BAUDRATE 115200 /* ... at 115200 bps */ #define CONFIG_SYS_BAUDRATE_TABLE { 9600, 19200, 38400, 57600, 115200, 230400 } /* diff --git a/include/configs/kc1.h b/include/configs/kc1.h index cc78a09..85bc0e3 100644 --- a/include/configs/kc1.h +++ b/include/configs/kc1.h @@ -16,8 +16,6 @@ * Build */ -#define CONFIG_SYS_THUMB_BUILD - /* * CPU */ @@ -130,7 +128,6 @@ #define CONFIG_SYS_NS16550_COM3 UART3_BASE #define CONFIG_CONS_INDEX 3 -#define CONFIG_BAUDRATE 115200 #define CONFIG_SYS_BAUDRATE_TABLE { 4800, 9600, 19200, 38400, 57600, \ 115200 } diff --git a/include/configs/km/keymile-common.h b/include/configs/km/keymile-common.h index 4ab96bf..24830ee 100644 --- a/include/configs/km/keymile-common.h +++ b/include/configs/km/keymile-common.h @@ -42,7 +42,6 @@ #define CONFIG_SYS_ALT_MEMTEST /* memory test, takes time */ -#define CONFIG_BAUDRATE 115200 #define CONFIG_SYS_BAUDRATE_TABLE { 9600, 19200, 38400, 57600, 115200, 230400 } #define CONFIG_LOADS_ECHO diff --git a/include/configs/kzm9g.h b/include/configs/kzm9g.h index a193688..feb3eec 100644 --- a/include/configs/kzm9g.h +++ b/include/configs/kzm9g.h @@ -23,7 +23,6 @@ #define CONFIG_SETUP_MEMORY_TAGS #define CONFIG_INITRD_TAG -#define CONFIG_BAUDRATE 115200 #define CONFIG_BOOTARGS "root=/dev/null console=ttySC4,115200" #undef CONFIG_SHOW_BOOT_PROGRESS diff --git a/include/configs/legoev3.h b/include/configs/legoev3.h index 0435124..07f42e3 100644 --- a/include/configs/legoev3.h +++ b/include/configs/legoev3.h @@ -122,7 +122,6 @@ #define CONFIG_SYS_NS16550_COM1 DAVINCI_UART1_BASE /* Base address of UART1 */ #define CONFIG_SYS_NS16550_CLK clk_get(DAVINCI_UART2_CLKID) #define CONFIG_CONS_INDEX 1 /* use UART0 for console */ -#define CONFIG_BAUDRATE 115200 /* Default baud rate */ #define CONFIG_SPI #define CONFIG_DAVINCI_SPI diff --git a/include/configs/ls1012a_common.h b/include/configs/ls1012a_common.h index e556c92..af07672 100644 --- a/include/configs/ls1012a_common.h +++ b/include/configs/ls1012a_common.h @@ -81,7 +81,6 @@ #define CONFIG_SYS_NS16550_REG_SIZE 1 #define CONFIG_SYS_NS16550_CLK (get_serial_clock()) -#define CONFIG_BAUDRATE 115200 #define CONFIG_SYS_BAUDRATE_TABLE { 9600, 19200, 38400, 57600, 115200 } /* Command line configuration */ diff --git a/include/configs/ls1021aiot.h b/include/configs/ls1021aiot.h index 2fc3fe9..db29fa2b 100644 --- a/include/configs/ls1021aiot.h +++ b/include/configs/ls1021aiot.h @@ -125,7 +125,6 @@ #define CONFIG_SYS_NS16550_SERIAL #define CONFIG_SYS_NS16550_REG_SIZE 1 #define CONFIG_SYS_NS16550_CLK get_serial_clock() -#define CONFIG_BAUDRATE 115200 /* * I2C diff --git a/include/configs/ls1021aqds.h b/include/configs/ls1021aqds.h index 6b640c4..4fb8b0c 100644 --- a/include/configs/ls1021aqds.h +++ b/include/configs/ls1021aqds.h @@ -365,8 +365,6 @@ unsigned long get_board_ddr_clk(void); #define CONFIG_SYS_NS16550_CLK get_serial_clock() #endif -#define CONFIG_BAUDRATE 115200 - /* * I2C */ diff --git a/include/configs/ls1021atwr.h b/include/configs/ls1021atwr.h index 7279c89..c6438d5 100644 --- a/include/configs/ls1021atwr.h +++ b/include/configs/ls1021atwr.h @@ -133,9 +133,9 @@ * size increases then increase this size in case of secure boot as * it uses raw u-boot image instead of fit image. */ -#define CONFIG_SYS_MONITOR_LEN (0x80000 + CONFIG_U_BOOT_HDR_SIZE) +#define CONFIG_SYS_MONITOR_LEN (0x100000 + CONFIG_U_BOOT_HDR_SIZE) #else -#define CONFIG_SYS_MONITOR_LEN 0x80000 +#define CONFIG_SYS_MONITOR_LEN 0x100000 #endif /* ifdef CONFIG_U_BOOT_HDR_SIZE */ #endif @@ -264,8 +264,6 @@ #define CONFIG_SYS_NS16550_CLK get_serial_clock() #endif -#define CONFIG_BAUDRATE 115200 - /* * I2C */ diff --git a/include/configs/ls1043a_common.h b/include/configs/ls1043a_common.h index 9a01e48..5a5f951 100644 --- a/include/configs/ls1043a_common.h +++ b/include/configs/ls1043a_common.h @@ -42,7 +42,6 @@ #define CONFIG_SYS_NS16550_REG_SIZE 1 #define CONFIG_SYS_NS16550_CLK (get_serial_clock()) -#define CONFIG_BAUDRATE 115200 #define CONFIG_SYS_BAUDRATE_TABLE { 9600, 19200, 38400, 57600, 115200 } /* SD boot SPL */ diff --git a/include/configs/ls1043aqds.h b/include/configs/ls1043aqds.h index f3b521d..6a345c0 100644 --- a/include/configs/ls1043aqds.h +++ b/include/configs/ls1043aqds.h @@ -38,7 +38,9 @@ unsigned long get_board_ddr_clk(void); #define SPD_EEPROM_ADDRESS 0x51 #define CONFIG_SYS_SPD_BUS_NUM 0 +#ifndef CONFIG_SPL #define CONFIG_FSL_DDR_INTERACTIVE /* Interactive debugging */ +#endif #define CONFIG_DDR_ECC #ifdef CONFIG_DDR_ECC diff --git a/include/configs/ls1043ardb.h b/include/configs/ls1043ardb.h index 8fa3bb3..f185380 100644 --- a/include/configs/ls1043ardb.h +++ b/include/configs/ls1043ardb.h @@ -29,7 +29,9 @@ #define CONFIG_SYS_SPD_BUS_NUM 0 #define CONFIG_FSL_DDR_BIST +#ifndef CONFIG_SPL #define CONFIG_FSL_DDR_INTERACTIVE /* Interactive debugging */ +#endif #define CONFIG_SYS_DDR_RAW_TIMING #define CONFIG_ECC_INIT_VIA_DDRCONTROLLER #define CONFIG_MEM_INIT_VALUE 0xdeadbeef diff --git a/include/configs/ls1046a_common.h b/include/configs/ls1046a_common.h index 8ec1247..1ed7517 100644 --- a/include/configs/ls1046a_common.h +++ b/include/configs/ls1046a_common.h @@ -41,7 +41,6 @@ #define CONFIG_SYS_NS16550_REG_SIZE 1 #define CONFIG_SYS_NS16550_CLK (get_serial_clock()) -#define CONFIG_BAUDRATE 115200 #define CONFIG_SYS_BAUDRATE_TABLE { 9600, 19200, 38400, 57600, 115200 } /* SD boot SPL */ diff --git a/include/configs/ls1046aqds.h b/include/configs/ls1046aqds.h index cba22ca..4b3b21e 100644 --- a/include/configs/ls1046aqds.h +++ b/include/configs/ls1046aqds.h @@ -38,7 +38,9 @@ unsigned long get_board_ddr_clk(void); #define SPD_EEPROM_ADDRESS 0x51 #define CONFIG_SYS_SPD_BUS_NUM 0 +#ifndef CONFIG_SPL #define CONFIG_FSL_DDR_INTERACTIVE /* Interactive debugging */ +#endif #define CONFIG_DDR_ECC #ifdef CONFIG_DDR_ECC diff --git a/include/configs/ls1046ardb.h b/include/configs/ls1046ardb.h index a96aa65..2141b82 100644 --- a/include/configs/ls1046ardb.h +++ b/include/configs/ls1046ardb.h @@ -34,7 +34,9 @@ #define CONFIG_ECC_INIT_VIA_DDRCONTROLLER #define CONFIG_MEM_INIT_VALUE 0xdeadbeef #define CONFIG_FSL_DDR_BIST /* enable built-in memory test */ +#ifndef CONFIG_SPL #define CONFIG_FSL_DDR_INTERACTIVE /* Interactive debugging */ +#endif #ifdef CONFIG_RAMBOOT_PBL #define CONFIG_SYS_FSL_PBL_PBI board/freescale/ls1046ardb/ls1046ardb_pbi.cfg diff --git a/include/configs/ls2080a_common.h b/include/configs/ls2080a_common.h index 4ba273a..5072e20 100644 --- a/include/configs/ls2080a_common.h +++ b/include/configs/ls2080a_common.h @@ -91,7 +91,6 @@ #define CONFIG_SYS_NS16550_REG_SIZE 1 #define CONFIG_SYS_NS16550_CLK (get_serial_clock()) -#define CONFIG_BAUDRATE 115200 #define CONFIG_SYS_BAUDRATE_TABLE { 9600, 19200, 38400, 57600, 115200 } /* IFC */ @@ -141,7 +140,6 @@ unsigned long long get_qixis_addr(void); #define CONFIG_SYS_NAND_BASE_PHYS 0x30000000 /* MC firmware */ -#define CONFIG_FSL_MC_ENET /* TODO Actual DPL max length needs to be confirmed with the MC FW team */ #define CONFIG_SYS_LS_MC_DPC_MAX_LENGTH 0x20000 #define CONFIG_SYS_LS_MC_DRAM_DPC_OFFSET 0x00F00000 @@ -159,7 +157,6 @@ unsigned long long get_qixis_addr(void); */ #ifdef CONFIG_FSL_MC_ENET #define CONFIG_SYS_LS_MC_DRAM_BLOCK_MIN_SIZE (512UL * 1024 * 1024) -#define CONFIG_SYS_MC_RSV_MEM_ALIGN (512UL * 1024 * 1024) #endif /* Command line configuration */ diff --git a/include/configs/lwmon5.h b/include/configs/lwmon5.h index 9bca8ac..70e7588 100644 --- a/include/configs/lwmon5.h +++ b/include/configs/lwmon5.h @@ -99,7 +99,6 @@ #define CONFIG_SYS_NS16550_REG_SIZE 1 #define CONFIG_SYS_NS16550_CLK get_serial_clock() #undef CONFIG_SYS_EXT_SERIAL_CLOCK /* no external clock provided */ -#define CONFIG_BAUDRATE 115200 #define CONFIG_SYS_BAUDRATE_TABLE \ {300, 600, 1200, 2400, 4800, 9600, 19200, 38400, 57600, 115200} diff --git a/include/configs/m53evk.h b/include/configs/m53evk.h index 56fb602..a70f041 100644 --- a/include/configs/m53evk.h +++ b/include/configs/m53evk.h @@ -73,7 +73,6 @@ #define CONFIG_MXC_UART #define CONFIG_MXC_UART_BASE UART2_BASE #define CONFIG_CONS_INDEX 1 -#define CONFIG_BAUDRATE 115200 /* * MMC Driver diff --git a/include/configs/malta.h b/include/configs/malta.h index 103360d..14298f5 100644 --- a/include/configs/malta.h +++ b/include/configs/malta.h @@ -63,7 +63,6 @@ /* * Serial driver */ -#define CONFIG_BAUDRATE 115200 #define CONFIG_SYS_NS16550_PORT_MAPPED /* diff --git a/include/configs/mcx.h b/include/configs/mcx.h index 06c1a95..6894c0b 100644 --- a/include/configs/mcx.h +++ b/include/configs/mcx.h @@ -72,7 +72,6 @@ /* allow to overwrite serial and ethaddr */ #define CONFIG_ENV_OVERWRITE -#define CONFIG_BAUDRATE 115200 #define CONFIG_SYS_BAUDRATE_TABLE {4800, 9600, 19200, 38400, 57600,\ 115200} diff --git a/include/configs/mecp5123.h b/include/configs/mecp5123.h index dadf438..dbb2426 100644 --- a/include/configs/mecp5123.h +++ b/include/configs/mecp5123.h @@ -215,7 +215,6 @@ #if CONFIG_PSC_CONSOLE != 3 #error CONFIG_PSC_CONSOLE must be 3 #endif -#define CONFIG_BAUDRATE 9600 /* ... at 9600 bps */ #define CONFIG_SYS_BAUDRATE_TABLE \ {300, 600, 1200, 2400, 4800, 9600, 19200, 38400, 115200} diff --git a/include/configs/meesc.h b/include/configs/meesc.h index 63881c5..3a8e82e 100644 --- a/include/configs/meesc.h +++ b/include/configs/meesc.h @@ -56,7 +56,6 @@ #define CONFIG_ATMEL_USART #define CONFIG_USART_BASE ATMEL_BASE_DBGU #define CONFIG_USART_ID ATMEL_ID_SYS -#define CONFIG_BAUDRATE 115200 /* * BOOTP options diff --git a/include/configs/microblaze-generic.h b/include/configs/microblaze-generic.h index 370481b..e8fe2f6 100644 --- a/include/configs/microblaze-generic.h +++ b/include/configs/microblaze-generic.h @@ -32,7 +32,6 @@ #endif /* uart */ -# define CONFIG_BAUDRATE 115200 /* The following table includes the supported baudrates */ # define CONFIG_SYS_BAUDRATE_TABLE \ {300, 600, 1200, 2400, 4800, 9600, 19200, 38400, 57600, 115200, 230400} diff --git a/include/configs/motionpro.h b/include/configs/motionpro.h index ab1d9f1..7ebcd03 100644 --- a/include/configs/motionpro.h +++ b/include/configs/motionpro.h @@ -47,7 +47,6 @@ */ #define CONFIG_PSC_CONSOLE 1 /* console is on PSC1 */ #define CONFIG_NETCONSOLE 1 /* network console */ -#define CONFIG_BAUDRATE 115200 #define CONFIG_SYS_BAUDRATE_TABLE { 9600, 19200, 38400, 57600, 115200, 230400 } /* diff --git a/include/configs/mpc5121-common.h b/include/configs/mpc5121-common.h index f06ca9c..d252297 100644 --- a/include/configs/mpc5121-common.h +++ b/include/configs/mpc5121-common.h @@ -24,7 +24,6 @@ /* * Serial console */ -#define CONFIG_BAUDRATE 115200 #define CONFIG_SYS_BAUDRATE_TABLE \ {300, 600, 1200, 2400, 4800, 9600, 19200, 38400, 57600, 115200} diff --git a/include/configs/mpc5121ads.h b/include/configs/mpc5121ads.h index fe9a703..1714a9b 100644 --- a/include/configs/mpc5121ads.h +++ b/include/configs/mpc5121ads.h @@ -274,7 +274,6 @@ #if CONFIG_PSC_CONSOLE != 3 #error CONFIG_PSC_CONSOLE must be 3 #endif -#define CONFIG_BAUDRATE 115200 /* ... at 115200 bps */ #define CONFIG_SYS_BAUDRATE_TABLE \ {300, 600, 1200, 2400, 4800, 9600, 19200, 38400,115200} @@ -503,8 +502,6 @@ #undef CONFIG_BOOTARGS /* the boot command will set bootargs */ -#define CONFIG_BAUDRATE 115200 - #define CONFIG_PREBOOT "echo;" \ "echo Type \\\"run flash_nfs\\\" to mount root filesystem over NFS;" \ "echo" diff --git a/include/configs/mpc8308_p1m.h b/include/configs/mpc8308_p1m.h index 76667d7..b865d9f 100644 --- a/include/configs/mpc8308_p1m.h +++ b/include/configs/mpc8308_p1m.h @@ -465,8 +465,6 @@ #define CONFIG_HAS_ETH1 #endif -#define CONFIG_BAUDRATE 115200 - #define CONFIG_LOADADDR 800000 /* default location for tftp and bootm */ diff --git a/include/configs/mpr2.h b/include/configs/mpr2.h index 0d37912..df8ffe2 100644 --- a/include/configs/mpr2.h +++ b/include/configs/mpr2.h @@ -13,7 +13,6 @@ /* Supported commands */ /* Default environment variables */ -#define CONFIG_BAUDRATE 115200 #define CONFIG_BOOTARGS "console=ttySC0,115200" #define CONFIG_BOOTFILE "/boot/zImage" #define CONFIG_LOADADDR 0x8E000000 diff --git a/include/configs/ms7720se.h b/include/configs/ms7720se.h index e074350..0015be9 100644 --- a/include/configs/ms7720se.h +++ b/include/configs/ms7720se.h @@ -16,7 +16,6 @@ #define CONFIG_CMD_PCMCIA #define CONFIG_CMD_IDE -#define CONFIG_BAUDRATE 115200 #define CONFIG_BOOTARGS "console=ttySC0,115200" #define CONFIG_BOOTFILE "/boot/zImage" #define CONFIG_LOADADDR 0x8E000000 diff --git a/include/configs/ms7722se.h b/include/configs/ms7722se.h index 181d021..26472e9 100644 --- a/include/configs/ms7722se.h +++ b/include/configs/ms7722se.h @@ -15,7 +15,6 @@ #define CONFIG_CMD_JFFS2 #define CONFIG_CMD_SDRAM -#define CONFIG_BAUDRATE 115200 #define CONFIG_BOOTARGS "console=ttySC0,115200 root=1f01" #define CONFIG_DISPLAY_BOARDINFO diff --git a/include/configs/ms7750se.h b/include/configs/ms7750se.h index dfa03fc..394ce6c 100644 --- a/include/configs/ms7750se.h +++ b/include/configs/ms7750se.h @@ -21,7 +21,6 @@ * Command line configuration. */ #define CONFIG_SCIF_CONSOLE 1 -#define CONFIG_BAUDRATE 38400 #define CONFIG_CONS_SCIF1 1 #define CONFIG_BOOTARGS "console=ttySC0,38400" diff --git a/include/configs/munices.h b/include/configs/munices.h index 5a6d004..1679430 100644 --- a/include/configs/munices.h +++ b/include/configs/munices.h @@ -37,7 +37,6 @@ * Serial console configuration */ #define CONFIG_PSC_CONSOLE 1 /* console is on PSC1 */ -#define CONFIG_BAUDRATE 115200 /* ... at 115200 bps */ #define CONFIG_SYS_BAUDRATE_TABLE { 9600, 19200, 38400, 57600, 115200, 230400 } #define CONFIG_TIMESTAMP 1 /* Print image info with timestamp */ diff --git a/include/configs/mv-common.h b/include/configs/mv-common.h index 25562fa..814f0dd 100644 --- a/include/configs/mv-common.h +++ b/include/configs/mv-common.h @@ -53,7 +53,6 @@ */ #define CONFIG_CONS_INDEX 1 /*Console on UART0 */ -#define CONFIG_BAUDRATE 115200 #define CONFIG_SYS_BAUDRATE_TABLE { 9600, 19200, 38400, 57600, \ 115200,230400, 460800, 921600 } /* auto boot */ diff --git a/include/configs/mvebu_armada-8k.h b/include/configs/mvebu_armada-8k.h index db1ba0d..a8a9d15 100644 --- a/include/configs/mvebu_armada-8k.h +++ b/include/configs/mvebu_armada-8k.h @@ -24,7 +24,6 @@ /* auto boot */ #define CONFIG_PREBOOT -#define CONFIG_BAUDRATE 115200 #define CONFIG_SYS_BAUDRATE_TABLE { 9600, 19200, 38400, 57600, \ 115200, 230400, 460800, 921600 } diff --git a/include/configs/mvebu_db-88f3720.h b/include/configs/mvebu_db-88f3720.h index 753ed1e..6bb78e0 100644 --- a/include/configs/mvebu_db-88f3720.h +++ b/include/configs/mvebu_db-88f3720.h @@ -22,7 +22,6 @@ /* auto boot */ #define CONFIG_PREBOOT -#define CONFIG_BAUDRATE 115200 #define CONFIG_SYS_BAUDRATE_TABLE { 9600, 19200, 38400, 57600, \ 115200, 230400, 460800, 921600 } diff --git a/include/configs/mx25pdk.h b/include/configs/mx25pdk.h index f787376..4cee64d 100644 --- a/include/configs/mx25pdk.h +++ b/include/configs/mx25pdk.h @@ -52,7 +52,6 @@ #define CONFIG_MXC_UART #define CONFIG_MXC_UART_BASE UART1_BASE #define CONFIG_CONS_INDEX 1 /* use UART0 for console */ -#define CONFIG_BAUDRATE 115200 /* Default baud rate */ /* No NOR flash present */ #define CONFIG_ENV_OFFSET (6 * 64 * 1024) diff --git a/include/configs/mx31ads.h b/include/configs/mx31ads.h index ce4936d..6ab822e 100644 --- a/include/configs/mx31ads.h +++ b/include/configs/mx31ads.h @@ -54,7 +54,6 @@ /* allow to overwrite serial and ethaddr */ #define CONFIG_ENV_OVERWRITE #define CONFIG_CONS_INDEX 1 -#define CONFIG_BAUDRATE 115200 /*********************************************************** * Command definition diff --git a/include/configs/mx31pdk.h b/include/configs/mx31pdk.h index f0cdebe..92050700 100644 --- a/include/configs/mx31pdk.h +++ b/include/configs/mx31pdk.h @@ -68,7 +68,6 @@ /* allow to overwrite serial and ethaddr */ #define CONFIG_ENV_OVERWRITE #define CONFIG_CONS_INDEX 1 -#define CONFIG_BAUDRATE 115200 /*********************************************************** * Command definition diff --git a/include/configs/mx35pdk.h b/include/configs/mx35pdk.h index 22d319a..9683a65 100644 --- a/include/configs/mx35pdk.h +++ b/include/configs/mx35pdk.h @@ -69,7 +69,6 @@ /* allow to overwrite serial and ethaddr */ #define CONFIG_ENV_OVERWRITE #define CONFIG_CONS_INDEX 1 -#define CONFIG_BAUDRATE 115200 /* * Command definition diff --git a/include/configs/mx51evk.h b/include/configs/mx51evk.h index 292fa86..98c9f9b 100644 --- a/include/configs/mx51evk.h +++ b/include/configs/mx51evk.h @@ -96,7 +96,6 @@ /* allow to overwrite serial and ethaddr */ #define CONFIG_ENV_OVERWRITE #define CONFIG_CONS_INDEX 1 -#define CONFIG_BAUDRATE 115200 /*********************************************************** * Command definition diff --git a/include/configs/mx53ard.h b/include/configs/mx53ard.h index d67ba85..8612614 100644 --- a/include/configs/mx53ard.h +++ b/include/configs/mx53ard.h @@ -59,7 +59,6 @@ /* allow to overwrite serial and ethaddr */ #define CONFIG_ENV_OVERWRITE #define CONFIG_CONS_INDEX 1 -#define CONFIG_BAUDRATE 115200 /* Command definition */ diff --git a/include/configs/mx53cx9020.h b/include/configs/mx53cx9020.h index a103ee4..3094402 100644 --- a/include/configs/mx53cx9020.h +++ b/include/configs/mx53cx9020.h @@ -59,7 +59,6 @@ /* allow to overwrite serial and ethaddr */ #define CONFIG_ENV_OVERWRITE #define CONFIG_CONS_INDEX 1 -#define CONFIG_BAUDRATE 115200 /* Command definition */ #define CONFIG_SUPPORT_RAW_INITRD diff --git a/include/configs/mx53evk.h b/include/configs/mx53evk.h index 251b6f0..b3519ae 100644 --- a/include/configs/mx53evk.h +++ b/include/configs/mx53evk.h @@ -65,7 +65,6 @@ /* allow to overwrite serial and ethaddr */ #define CONFIG_ENV_OVERWRITE #define CONFIG_CONS_INDEX 1 -#define CONFIG_BAUDRATE 115200 /* Command definition */ diff --git a/include/configs/mx53loco.h b/include/configs/mx53loco.h index 7cd750c..fed40eb 100644 --- a/include/configs/mx53loco.h +++ b/include/configs/mx53loco.h @@ -73,7 +73,6 @@ /* allow to overwrite serial and ethaddr */ #define CONFIG_ENV_OVERWRITE #define CONFIG_CONS_INDEX 1 -#define CONFIG_BAUDRATE 115200 /* Command definition */ #define CONFIG_SUPPORT_RAW_INITRD diff --git a/include/configs/mx53smd.h b/include/configs/mx53smd.h index e7c3a1d..e9d570e 100644 --- a/include/configs/mx53smd.h +++ b/include/configs/mx53smd.h @@ -53,7 +53,6 @@ /* allow to overwrite serial and ethaddr */ #define CONFIG_ENV_OVERWRITE #define CONFIG_CONS_INDEX 1 -#define CONFIG_BAUDRATE 115200 /* Command definition */ diff --git a/include/configs/mx6_common.h b/include/configs/mx6_common.h index afe9b93..c841ca9 100644 --- a/include/configs/mx6_common.h +++ b/include/configs/mx6_common.h @@ -54,7 +54,6 @@ /* allow to overwrite serial and ethaddr */ #define CONFIG_ENV_OVERWRITE #define CONFIG_CONS_INDEX 1 -#define CONFIG_BAUDRATE 115200 /* Filesystems and image support */ #define CONFIG_SUPPORT_RAW_INITRD diff --git a/include/configs/mx7_common.h b/include/configs/mx7_common.h index b10b7f1..5bf8ad7 100644 --- a/include/configs/mx7_common.h +++ b/include/configs/mx7_common.h @@ -35,7 +35,6 @@ /* allow to overwrite serial and ethaddr */ #define CONFIG_ENV_OVERWRITE #define CONFIG_CONS_INDEX 1 -#define CONFIG_BAUDRATE 115200 /* Miscellaneous configurable options */ #define CONFIG_SYS_LONGHELP diff --git a/include/configs/mxs.h b/include/configs/mxs.h index 12b456b..fdf596f 100644 --- a/include/configs/mxs.h +++ b/include/configs/mxs.h @@ -114,9 +114,6 @@ #define CONFIG_PL01x_PORTS { (void *)MXS_UARTDBG_BASE } #define CONFIG_CONS_INDEX 0 /* Default baudrate can be overridden by board! */ -#ifndef CONFIG_BAUDRATE -#define CONFIG_BAUDRATE 115200 -#endif /* FEC Ethernet on SoC */ #ifdef CONFIG_FEC_MXC diff --git a/include/configs/nokia_rx51.h b/include/configs/nokia_rx51.h index 5b0cb2e..6b128df 100644 --- a/include/configs/nokia_rx51.h +++ b/include/configs/nokia_rx51.h @@ -87,7 +87,6 @@ /* allow to overwrite serial and ethaddr */ #define CONFIG_ENV_OVERWRITE -#define CONFIG_BAUDRATE 115200 #define CONFIG_SYS_BAUDRATE_TABLE { 4800, 9600, 19200, 38400, 57600, 115200 } /* USB */ diff --git a/include/configs/nsim.h b/include/configs/nsim.h index e804916..0cc55b7 100644 --- a/include/configs/nsim.h +++ b/include/configs/nsim.h @@ -36,7 +36,6 @@ */ #define CONFIG_ARC_SERIAL #define CONFIG_ARC_UART_BASE 0xC0FC1000 -#define CONFIG_BAUDRATE 115200 /* * Command line configuration diff --git a/include/configs/o2dnt-common.h b/include/configs/o2dnt-common.h index 8a414c3..1470c51 100644 --- a/include/configs/o2dnt-common.h +++ b/include/configs/o2dnt-common.h @@ -40,7 +40,6 @@ * Serial console configuration */ #define CONFIG_PSC_CONSOLE 5 /* console is on PSC5 */ -#define CONFIG_BAUDRATE 115200 /* ... at 115200 bps */ #define CONFIG_SYS_BAUDRATE_TABLE \ { 9600, 19200, 38400, 57600, 115200, 230400 } diff --git a/include/configs/odroid-c2.h b/include/configs/odroid-c2.h index 48f4a68..117c0e4 100644 --- a/include/configs/odroid-c2.h +++ b/include/configs/odroid-c2.h @@ -12,7 +12,6 @@ /* Serial setup */ #define CONFIG_CONS_INDEX 0 -#define CONFIG_BAUDRATE 115200 #define MESON_FDTFILE_SETTING "fdtfile=amlogic/meson-gxbb-odroidc2.dtb\0" diff --git a/include/configs/odroid.h b/include/configs/odroid.h index 2828f07..6cc7dd1 100644 --- a/include/configs/odroid.h +++ b/include/configs/odroid.h @@ -40,7 +40,6 @@ /* select serial console configuration */ #define CONFIG_SERIAL1 -#define CONFIG_BAUDRATE 115200 /* Console configuration */ diff --git a/include/configs/omap3_evm.h b/include/configs/omap3_evm.h index a28f9ba..329dc73 100644 --- a/include/configs/omap3_evm.h +++ b/include/configs/omap3_evm.h @@ -148,7 +148,6 @@ #define CONFIG_CONS_INDEX 1 #define CONFIG_SERIAL1 1 /* UART1 on OMAP3 EVM */ #define CONFIG_SYS_NS16550_COM1 OMAP34XX_UART1 -#define CONFIG_BAUDRATE 115200 #define CONFIG_SYS_BAUDRATE_TABLE {4800, 9600, 19200, 38400, 57600,\ 115200} diff --git a/include/configs/omap5_uevm.h b/include/configs/omap5_uevm.h index df60b49..533bb02 100644 --- a/include/configs/omap5_uevm.h +++ b/include/configs/omap5_uevm.h @@ -31,7 +31,6 @@ #define CONFIG_CONS_INDEX 3 #define CONFIG_SYS_NS16550_COM3 UART3_BASE -#define CONFIG_BAUDRATE 115200 #define CONFIG_MISC_INIT_R /* MMC ENV related defines */ diff --git a/include/configs/omapl138_lcdk.h b/include/configs/omapl138_lcdk.h index 76d66a0..6700073 100644 --- a/include/configs/omapl138_lcdk.h +++ b/include/configs/omapl138_lcdk.h @@ -127,7 +127,6 @@ #define CONFIG_SYS_NS16550_COM1 DAVINCI_UART2_BASE /* Base address of UART2 */ #define CONFIG_SYS_NS16550_CLK clk_get(DAVINCI_UART2_CLKID) #define CONFIG_CONS_INDEX 1 /* use UART0 for console */ -#define CONFIG_BAUDRATE 115200 /* Default baud rate */ #define CONFIG_SYS_BAUDRATE_TABLE { 9600, 19200, 38400, 57600, 115200 } #define CONFIG_SPI diff --git a/include/configs/openrd.h b/include/configs/openrd.h index 14cf3b4..19660db 100644 --- a/include/configs/openrd.h +++ b/include/configs/openrd.h @@ -21,7 +21,6 @@ #define CONFIG_KW88F6281 1 /* SOC Name */ #define CONFIG_MACH_OPENRD_BASE /* Machine type */ #define CONFIG_SKIP_LOWLEVEL_INIT /* disable board lowlevel_init */ -#define CONFIG_SYS_THUMB_BUILD /* * Commands configuration diff --git a/include/configs/openrisc-generic.h b/include/configs/openrisc-generic.h index 7b2ce78..549b33c 100644 --- a/include/configs/openrisc-generic.h +++ b/include/configs/openrisc-generic.h @@ -35,7 +35,6 @@ # define CONFIG_SYS_NS16550_COM1 (0x90000000) # define CONFIG_SYS_NS16550_CLK CONFIG_SYS_CLK_FREQ -#define CONFIG_BAUDRATE CONFIG_SYS_UART_BAUD #define CONFIG_SYS_BAUDRATE_TABLE {CONFIG_BAUDRATE} #define CONSOLE_ARG "console=console=ttyS0,115200\0" diff --git a/include/configs/origen.h b/include/configs/origen.h index 26fe402..6980e9e 100644 --- a/include/configs/origen.h +++ b/include/configs/origen.h @@ -34,7 +34,6 @@ /* select serial console configuration */ #define CONFIG_SERIAL2 -#define CONFIG_BAUDRATE 115200 /* Console configuration */ #define CONFIG_DEFAULT_CONSOLE "console=ttySAC1,115200n8\0" diff --git a/include/configs/p1_p2_rdb_pc.h b/include/configs/p1_p2_rdb_pc.h index 88876d6..479f45d 100644 --- a/include/configs/p1_p2_rdb_pc.h +++ b/include/configs/p1_p2_rdb_pc.h @@ -884,8 +884,6 @@ #define CONFIG_BOOTARGS /* the boot command will set bootargs */ -#define CONFIG_BAUDRATE 115200 - #ifdef __SW_BOOT_NOR #define __NOR_RST_CMD \ norboot=i2c dev 1; i2c mw 18 1 __SW_BOOT_NOR 1; \ diff --git a/include/configs/p1_twr.h b/include/configs/p1_twr.h index d403f84..dad0616 100644 --- a/include/configs/p1_twr.h +++ b/include/configs/p1_twr.h @@ -446,8 +446,6 @@ extern unsigned long get_board_sys_clk(unsigned long dummy); #define CONFIG_BOOTARGS /* the boot command will set bootargs */ -#define CONFIG_BAUDRATE 115200 - #define CONFIG_EXTRA_ENV_SETTINGS \ "netdev=eth0\0" \ "uboot=" __stringify(CONFIG_UBOOTPATH) "\0" \ diff --git a/include/configs/pb1x00.h b/include/configs/pb1x00.h index 10d39e0..504ddf7 100644 --- a/include/configs/pb1x00.h +++ b/include/configs/pb1x00.h @@ -29,9 +29,6 @@ #endif #endif - -#define CONFIG_BAUDRATE 115200 - #define CONFIG_TIMESTAMP /* Print image info with timestamp */ #undef CONFIG_BOOTARGS diff --git a/include/configs/pcm030.h b/include/configs/pcm030.h index 47ded81..87aa9dc 100644 --- a/include/configs/pcm030.h +++ b/include/configs/pcm030.h @@ -44,7 +44,6 @@ Serial console configuration /*define gps port conf. */ /* register later on to */ /*enable UART function! */ -#define CONFIG_BAUDRATE 115200 /* ... at 115200 bps */ #define CONFIG_SYS_BAUDRATE_TABLE { 9600, 19200, 38400, 57600, 115200, 230400 } /* diff --git a/include/configs/pcm052.h b/include/configs/pcm052.h index ba3b975..286598d 100644 --- a/include/configs/pcm052.h +++ b/include/configs/pcm052.h @@ -11,8 +11,6 @@ #include <asm/arch/imx-regs.h> -#define CONFIG_SYS_THUMB_BUILD - #define CONFIG_SKIP_LOWLEVEL_INIT /* Enable passing of ATAGs */ @@ -23,7 +21,6 @@ /* Allow to overwrite serial and ethaddr */ #define CONFIG_ENV_OVERWRITE -#define CONFIG_BAUDRATE 115200 /* NAND support */ #define CONFIG_CMD_NAND diff --git a/include/configs/pengwyn.h b/include/configs/pengwyn.h index 34f88e5..b8fb371 100644 --- a/include/configs/pengwyn.h +++ b/include/configs/pengwyn.h @@ -104,7 +104,6 @@ /* NS16550 Configuration: primary UART via FTDI */ #define CONFIG_SYS_NS16550_COM1 0x44e09000 -#define CONFIG_BAUDRATE 115200 /* I2C Configuration */ #define CONFIG_SYS_I2C_SPEED 100000 diff --git a/include/configs/pic32mzdask.h b/include/configs/pic32mzdask.h index 6c7539f..dacb78a 100644 --- a/include/configs/pic32mzdask.h +++ b/include/configs/pic32mzdask.h @@ -59,7 +59,6 @@ /*------------------------------------------------------------ * Console Configuration */ -#define CONFIG_BAUDRATE 115200 #define CONFIG_SYS_CBSIZE 1024 /* Console I/O Buffer Size */ #define CONFIG_SYS_MAXARGS 16 /* max number of command args*/ #define CONFIG_SYS_PBSIZE \ diff --git a/include/configs/picosam9g45.h b/include/configs/picosam9g45.h index 7623089..61c4b98 100644 --- a/include/configs/picosam9g45.h +++ b/include/configs/picosam9g45.h @@ -129,8 +129,6 @@ "bootz 0x22000000 - 0x21000000" #endif -#define CONFIG_BAUDRATE 115200 - #define CONFIG_SYS_CBSIZE 256 #define CONFIG_SYS_MAXARGS 16 #define CONFIG_SYS_PBSIZE (CONFIG_SYS_CBSIZE \ diff --git a/include/configs/pm9261.h b/include/configs/pm9261.h index 79b35d7..ca1404a 100644 --- a/include/configs/pm9261.h +++ b/include/configs/pm9261.h @@ -319,8 +319,6 @@ #error "Undefined memory device" #endif -#define CONFIG_BAUDRATE 115200 - #define CONFIG_SYS_CBSIZE 256 #define CONFIG_SYS_MAXARGS 16 #define CONFIG_SYS_PBSIZE \ diff --git a/include/configs/pm9263.h b/include/configs/pm9263.h index ffea8c6..52791bc 100644 --- a/include/configs/pm9263.h +++ b/include/configs/pm9263.h @@ -353,8 +353,6 @@ #error "Undefined memory device" #endif -#define CONFIG_BAUDRATE 115200 - #define CONFIG_SYS_CBSIZE 256 #define CONFIG_SYS_MAXARGS 16 #define CONFIG_SYS_PBSIZE \ diff --git a/include/configs/pm9g45.h b/include/configs/pm9g45.h index c3a07f7..22b3c2e 100644 --- a/include/configs/pm9g45.h +++ b/include/configs/pm9g45.h @@ -133,8 +133,6 @@ "2M(linux)ro,-(root) rw " \ "rootfstype=jffs2" -#define CONFIG_BAUDRATE 115200 - #define CONFIG_SYS_CBSIZE 256 #define CONFIG_SYS_MAXARGS 16 #define CONFIG_SYS_PBSIZE (CONFIG_SYS_CBSIZE + \ diff --git a/include/configs/pr1.h b/include/configs/pr1.h index 500d715..d3fba0d 100644 --- a/include/configs/pr1.h +++ b/include/configs/pr1.h @@ -110,7 +110,6 @@ /* * Misc Settings */ -#define CONFIG_BAUDRATE 115200 #define CONFIG_RTC_BFIN #define CONFIG_UART_CONSOLE 0 #define CONFIG_BOOTCOMMAND "run nandboot" diff --git a/include/configs/qemu-mips.h b/include/configs/qemu-mips.h index 6fdf50b..be7f4f2 100644 --- a/include/configs/qemu-mips.h +++ b/include/configs/qemu-mips.h @@ -16,9 +16,6 @@ #define CONFIG_MISC_INIT_R - -#define CONFIG_BAUDRATE 115200 - #define CONFIG_TIMESTAMP /* Print image info with timestamp */ #undef CONFIG_BOOTARGS diff --git a/include/configs/qemu-mips64.h b/include/configs/qemu-mips64.h index 4ad230c..39afbff 100644 --- a/include/configs/qemu-mips64.h +++ b/include/configs/qemu-mips64.h @@ -16,9 +16,6 @@ #define CONFIG_MISC_INIT_R - -#define CONFIG_BAUDRATE 115200 - #define CONFIG_TIMESTAMP /* Print image info with timestamp */ #undef CONFIG_BOOTARGS diff --git a/include/configs/qemu-ppce500.h b/include/configs/qemu-ppce500.h index 234fc69..ffd776f 100644 --- a/include/configs/qemu-ppce500.h +++ b/include/configs/qemu-ppce500.h @@ -163,8 +163,6 @@ extern unsigned long long get_phys_ccsrbar_addr_early(void); /* default location for tftp and bootm */ #define CONFIG_LOADADDR 1000000 -#define CONFIG_BAUDRATE 115200 - #define CONFIG_BOOTCOMMAND \ "test -n \"$qemu_kernel_addr\" && bootm $qemu_kernel_addr - $fdt_addr_r\0" diff --git a/include/configs/r0p7734.h b/include/configs/r0p7734.h index 1ac15e2..642572f 100644 --- a/include/configs/r0p7734.h +++ b/include/configs/r0p7734.h @@ -19,7 +19,6 @@ #define CONFIG_CMD_SDRAM #define CONFIG_CMD_ENV -#define CONFIG_BAUDRATE 115200 #define CONFIG_BOOTARGS "console=ttySC3,115200" #define CONFIG_DISPLAY_BOARDINFO diff --git a/include/configs/r2dplus.h b/include/configs/r2dplus.h index d37b39d..64fc5b2 100644 --- a/include/configs/r2dplus.h +++ b/include/configs/r2dplus.h @@ -17,7 +17,6 @@ /* SCIF */ #define CONFIG_SCIF_CONSOLE 1 -#define CONFIG_BAUDRATE 115200 #define CONFIG_CONS_SCIF1 1 #define CONFIG_BOOTARGS "console=ttySC0,115200" diff --git a/include/configs/r7780mp.h b/include/configs/r7780mp.h index 9322f27..2efe36f 100644 --- a/include/configs/r7780mp.h +++ b/include/configs/r7780mp.h @@ -25,7 +25,6 @@ #define CONFIG_CMD_IDE #define CONFIG_SCIF_CONSOLE 1 -#define CONFIG_BAUDRATE 115200 #define CONFIG_CONS_SCIF0 1 #define CONFIG_BOOTARGS "console=ttySC0,115200" diff --git a/include/configs/rcar-gen2-common.h b/include/configs/rcar-gen2-common.h index 39c40d3..afa37a5 100644 --- a/include/configs/rcar-gen2-common.h +++ b/include/configs/rcar-gen2-common.h @@ -14,8 +14,6 @@ #define CONFIG_CMD_DFL #define CONFIG_CMD_SDRAM -#define CONFIG_SYS_THUMB_BUILD - /* Support File sytems */ #define CONFIG_FAT_WRITE #define CONFIG_SUPPORT_VFAT @@ -27,7 +25,6 @@ #define CONFIG_INITRD_TAG #define CONFIG_CMDLINE_EDITING -#define CONFIG_BAUDRATE 38400 #define CONFIG_BOOTARGS "" #undef CONFIG_SHOW_BOOT_PROGRESS diff --git a/include/configs/rcar-gen3-common.h b/include/configs/rcar-gen3-common.h index 5fe0686..36e07dc 100644 --- a/include/configs/rcar-gen3-common.h +++ b/include/configs/rcar-gen3-common.h @@ -37,8 +37,6 @@ #define CONFIG_CMDLINE_EDITING #define CONFIG_OF_LIBFDT -#define CONFIG_BAUDRATE 115200 - #undef CONFIG_SHOW_BOOT_PROGRESS #define CONFIG_ARCH_CPU_INIT diff --git a/include/configs/rk3036_common.h b/include/configs/rk3036_common.h index 318a52c..2893f80 100644 --- a/include/configs/rk3036_common.h +++ b/include/configs/rk3036_common.h @@ -13,11 +13,9 @@ #define CONFIG_ENV_IS_NOWHERE #define CONFIG_ENV_SIZE 0x2000 #define CONFIG_SYS_MAXARGS 16 -#define CONFIG_BAUDRATE 115200 #define CONFIG_SYS_MALLOC_LEN (32 << 20) #define CONFIG_SYS_CBSIZE 1024 #define CONFIG_SKIP_LOWLEVEL_INIT -#define CONFIG_SYS_THUMB_BUILD #define CONFIG_SYS_TIMER_RATE (24 * 1000 * 1000) #define CONFIG_SYS_TIMER_BASE 0x200440a0 /* TIMER5 */ diff --git a/include/configs/rk3188_common.h b/include/configs/rk3188_common.h new file mode 100644 index 0000000..d7e96ec --- /dev/null +++ b/include/configs/rk3188_common.h @@ -0,0 +1,119 @@ +/* + * (C) Copyright 2015 Google, Inc + * + * SPDX-License-Identifier: GPL-2.0+ + */ + +#ifndef __CONFIG_RK3188_COMMON_H +#define __CONFIG_RK3188_COMMON_H + +#define CONFIG_SYS_CACHELINE_SIZE 64 + +#include <asm/arch/hardware.h> +#include "rockchip-common.h" + +#define CONFIG_SKIP_LOWLEVEL_INIT_ONLY +#define CONFIG_NR_DRAM_BANKS 1 +#define CONFIG_ENV_SIZE 0x2000 +#define CONFIG_SYS_MAXARGS 16 +#define CONFIG_SYS_MALLOC_LEN (32 << 20) +#define CONFIG_SYS_CBSIZE 1024 +#define CONFIG_SYS_THUMB_BUILD + +#define CONFIG_SYS_TIMER_RATE (24 * 1000 * 1000) +#define CONFIG_SYS_TIMER_BASE 0x2000e000 /* TIMER3 */ +#define CONFIG_SYS_TIMER_COUNTER (CONFIG_SYS_TIMER_BASE + 8) +#define CONFIG_SYS_TIMER_COUNTS_DOWN + +#define CONFIG_SYS_NS16550_MEM32 +#define CONFIG_SPL_BOARD_INIT + +#ifdef CONFIG_ROCKCHIP_SPL_BACK_TO_BROM +/* Bootrom will load u-boot binary to 0x60000000 once return from SPL */ +#define CONFIG_SYS_TEXT_BASE 0x60000000 +#else +#define CONFIG_SYS_TEXT_BASE 0x60100000 +#endif +#define CONFIG_SYS_INIT_SP_ADDR 0x60100000 +#define CONFIG_SYS_LOAD_ADDR 0x60800800 + +#define CONFIG_ROCKCHIP_MAX_INIT_SIZE (0x8000 - 0x800) +#define CONFIG_ROCKCHIP_CHIP_TAG "RK31" + +#ifdef CONFIG_TPL_BUILD +#define CONFIG_SPL_TEXT_BASE 0x10080804 +/* tpl size 1kb - 4byte RK31 header */ +#define CONFIG_SPL_MAX_SIZE (0x400 - 0x4) +#elif defined(CONFIG_SPL_BUILD) +/* spl size 32kb sram - 2kb bootrom - 1kb spl */ +#define CONFIG_SPL_MAX_SIZE (0x8000 - 0xC00) +#define CONFIG_SPL_TEXT_BASE 0x10080C00 +#define CONFIG_SPL_FRAMEWORK 1 +#define CONFIG_SPL_CLK 1 +#define CONFIG_SPL_PINCTRL 1 +#define CONFIG_SPL_REGMAP 1 +#define CONFIG_SPL_SYSCON 1 +#define CONFIG_SPL_RAM 1 +#define CONFIG_SPL_DRIVERS_MISC_SUPPORT 1 +#define CONFIG_ROCKCHIP_SERIAL 1 +#endif + +#define CONFIG_SPL_STACK 0x10087fff + +/* MMC/SD IP block */ +#define CONFIG_BOUNCE_BUFFER + +#define CONFIG_FAT_WRITE + +#define CONFIG_SYS_SDRAM_BASE 0x60000000 +#define CONFIG_NR_DRAM_BANKS 1 +#define SDRAM_BANK_SIZE (2UL << 30) + +#define CONFIG_SPI_FLASH +#define CONFIG_SPI +#define CONFIG_SF_DEFAULT_SPEED 20000000 + +#ifndef CONFIG_SPL_BUILD +/* usb otg */ +#define CONFIG_USB_GADGET +#define CONFIG_USB_GADGET_DUALSPEED +#define CONFIG_USB_GADGET_DWC2_OTG +#define CONFIG_ROCKCHIP_USB2_PHY +#define CONFIG_USB_GADGET_VBUS_DRAW 0 + +#define CONFIG_USB_GADGET_DOWNLOAD +#define CONFIG_G_DNL_MANUFACTURER "Rockchip" +#define CONFIG_G_DNL_VENDOR_NUM 0x2207 +#define CONFIG_G_DNL_PRODUCT_NUM 0x310a + +/* usb host support */ +#ifdef CONFIG_CMD_USB +#define CONFIG_USB_DWC2 +#define CONFIG_USB_HOST_ETHER +#define CONFIG_USB_ETHER_SMSC95XX +#define CONFIG_USB_ETHER_ASIX +#endif +#define ENV_MEM_LAYOUT_SETTINGS \ + "scriptaddr=0x60000000\0" \ + "pxefile_addr_r=0x60100000\0" \ + "fdt_addr_r=0x61f00000\0" \ + "kernel_addr_r=0x62000000\0" \ + "ramdisk_addr_r=0x64000000\0" + +#include <config_distro_bootcmd.h> + +/* Linux fails to load the fdt if it's loaded above 256M on a Rock board, + * so limit the fdt reallocation to that */ +#define CONFIG_EXTRA_ENV_SETTINGS \ + "fdt_high=0x6fffffff\0" \ + "initrd_high=0x6fffffff\0" \ + "partitions=" PARTS_DEFAULT \ + ENV_MEM_LAYOUT_SETTINGS \ + ROCKCHIP_DEVICE_SETTINGS \ + BOOTENV + +#endif /* CONFIG_SPL_BUILD */ + +#define CONFIG_PREBOOT + +#endif diff --git a/include/configs/rk3288_common.h b/include/configs/rk3288_common.h index b5606d4..e7a8f72 100644 --- a/include/configs/rk3288_common.h +++ b/include/configs/rk3288_common.h @@ -14,10 +14,8 @@ #define CONFIG_NR_DRAM_BANKS 1 #define CONFIG_ENV_SIZE 0x2000 #define CONFIG_SYS_MAXARGS 16 -#define CONFIG_BAUDRATE 115200 #define CONFIG_SYS_MALLOC_LEN (32 << 20) #define CONFIG_SYS_CBSIZE 1024 -#define CONFIG_SYS_THUMB_BUILD #define CONFIG_SYS_TIMER_RATE (24 * 1000 * 1000) #define CONFIG_SYS_TIMER_BASE 0xff810020 /* TIMER7 */ diff --git a/include/configs/rk3328_common.h b/include/configs/rk3328_common.h new file mode 100644 index 0000000..b0dcd48 --- /dev/null +++ b/include/configs/rk3328_common.h @@ -0,0 +1,64 @@ +/* + * (C) Copyright 2016 Rockchip Electronics Co., Ltd + * + * SPDX-License-Identifier: GPL-2.0+ + */ + +#ifndef __CONFIG_RK3328_COMMON_H +#define __CONFIG_RK3328_COMMON_H + +#include "rockchip-common.h" + +#define CONFIG_NR_DRAM_BANKS 1 +#define CONFIG_ENV_SIZE 0x2000 +#define CONFIG_SYS_MAXARGS 16 +#define CONFIG_SYS_MALLOC_LEN (32 << 20) +#define CONFIG_SYS_CBSIZE 1024 +#define CONFIG_SKIP_LOWLEVEL_INIT + +#define CONFIG_SYS_NS16550_MEM32 + +#define CONFIG_SYS_TEXT_BASE 0x00200000 +#define CONFIG_SYS_INIT_SP_ADDR 0x00300000 +#define CONFIG_SYS_LOAD_ADDR 0x00800800 + +#define CONFIG_SYS_BOOTM_LEN (64 << 20) /* 64M */ + +/* MMC/SD IP block */ +#define CONFIG_BOUNCE_BUFFER + +#define CONFIG_SUPPORT_VFAT +#define CONFIG_FS_FAT +#define CONFIG_FAT_WRITE +#define CONFIG_FS_EXT4 + +/* RAW SD card / eMMC locations. */ +#define CONFIG_SYS_SPI_U_BOOT_OFFS (128 << 10) + +/* FAT sd card locations. */ +#define CONFIG_SYS_MMCSD_FS_BOOT_PARTITION 1 +#define CONFIG_SYS_SDRAM_BASE 0 +#define CONFIG_NR_DRAM_BANKS 1 + +#define CONFIG_SPI_FLASH +#define CONFIG_SPI +#define CONFIG_SF_DEFAULT_SPEED 20000000 + +#ifndef CONFIG_SPL_BUILD + +#define ENV_MEM_LAYOUT_SETTINGS \ + "scriptaddr=0x00500000\0" \ + "pxefile_addr_r=0x00600000\0" \ + "fdt_addr_r=0x01f00000\0" \ + "kernel_addr_r=0x02000000\0" \ + "ramdisk_addr_r=0x04000000\0" + +#include <config_distro_bootcmd.h> +#define CONFIG_EXTRA_ENV_SETTINGS \ + ENV_MEM_LAYOUT_SETTINGS \ + "partitions=" PARTS_DEFAULT \ + BOOTENV + +#endif + +#endif diff --git a/include/configs/rk3399_common.h b/include/configs/rk3399_common.h index ce64476..4ba81ac 100644 --- a/include/configs/rk3399_common.h +++ b/include/configs/rk3399_common.h @@ -12,16 +12,26 @@ #define CONFIG_NR_DRAM_BANKS 1 #define CONFIG_ENV_SIZE 0x2000 #define CONFIG_SYS_MAXARGS 16 -#define CONFIG_BAUDRATE 1500000 #define CONFIG_SYS_MALLOC_LEN (32 << 20) #define CONFIG_SYS_CBSIZE 1024 #define CONFIG_SKIP_LOWLEVEL_INIT +#define CONFIG_SPL_FRAMEWORK +#define CONFIG_SPL_DRIVERS_MISC_SUPPORT +#define CONFIG_SPL_LIBCOMMON_SUPPORT +#define CONFIG_SPL_LIBGENERIC_SUPPORT +#define CONFIG_SPL_SERIAL_SUPPORT #define CONFIG_SYS_NS16550_MEM32 #define CONFIG_SYS_TEXT_BASE 0x00200000 #define CONFIG_SYS_INIT_SP_ADDR 0x00300000 #define CONFIG_SYS_LOAD_ADDR 0x00800800 +#define CONFIG_SPL_STACK 0xff8effff +#define CONFIG_SPL_TEXT_BASE 0xff8c2008 +#define CONFIG_SPL_MAX_SIZE 0x30000 +/* BSS setup */ +#define CONFIG_SPL_BSS_START_ADDR 0xff8e0000 +#define CONFIG_SPL_BSS_MAX_SIZE 0x10000 #define CONFIG_SYS_BOOTM_LEN (64 << 20) /* 64M */ diff --git a/include/configs/rpi.h b/include/configs/rpi.h index e293f2e..92eb792 100644 --- a/include/configs/rpi.h +++ b/include/configs/rpi.h @@ -99,7 +99,6 @@ #define CONFIG_PL01X_SERIAL #endif #define CONFIG_CONS_INDEX 0 -#define CONFIG_BAUDRATE 115200 /* Console configuration */ #define CONFIG_SYS_CBSIZE 1024 diff --git a/include/configs/rsk7203.h b/include/configs/rsk7203.h index 913cbc2..8dc839d 100644 --- a/include/configs/rsk7203.h +++ b/include/configs/rsk7203.h @@ -15,7 +15,6 @@ #define CONFIG_CMD_SDRAM -#define CONFIG_BAUDRATE 115200 #define CONFIG_BOOTARGS "console=ttySC0,115200" #define CONFIG_LOADADDR 0x0C100000 /* RSK7203_SDRAM_BASE + 1MB */ diff --git a/include/configs/rsk7264.h b/include/configs/rsk7264.h index ea60014..cc70909 100644 --- a/include/configs/rsk7264.h +++ b/include/configs/rsk7264.h @@ -16,7 +16,6 @@ #define CONFIG_DISPLAY_BOARDINFO -#define CONFIG_BAUDRATE 115200 #define CONFIG_BOOTARGS "console=ttySC3,115200" #define CONFIG_SYS_BAUDRATE_TABLE { CONFIG_BAUDRATE } diff --git a/include/configs/rsk7269.h b/include/configs/rsk7269.h index f470954..12812f9 100644 --- a/include/configs/rsk7269.h +++ b/include/configs/rsk7269.h @@ -15,7 +15,6 @@ #define CONFIG_DISPLAY_BOARDINFO -#define CONFIG_BAUDRATE 115200 #define CONFIG_BOOTARGS "console=ttySC7,115200" #define CONFIG_SYS_BAUDRATE_TABLE { CONFIG_BAUDRATE } diff --git a/include/configs/s32v234evb.h b/include/configs/s32v234evb.h index 33ff6d5..0b12bf3 100644 --- a/include/configs/s32v234evb.h +++ b/include/configs/s32v234evb.h @@ -72,7 +72,6 @@ /* Allow to overwrite serial and ethaddr */ #define CONFIG_ENV_OVERWRITE #define CONFIG_SYS_UART_PORT (1) -#define CONFIG_BAUDRATE 115200 #undef CONFIG_CMD_IMLS diff --git a/include/configs/s5p_goni.h b/include/configs/s5p_goni.h index e9dc57d..e49b3d9 100644 --- a/include/configs/s5p_goni.h +++ b/include/configs/s5p_goni.h @@ -44,7 +44,6 @@ * select serial console configuration */ #define CONFIG_SERIAL2 1 /* use SERIAL2 */ -#define CONFIG_BAUDRATE 115200 /* MMC */ #define SDHCI_MAX_HOSTS 4 diff --git a/include/configs/s5pc210_universal.h b/include/configs/s5pc210_universal.h index 1bfefe9..627a341 100644 --- a/include/configs/s5pc210_universal.h +++ b/include/configs/s5pc210_universal.h @@ -26,7 +26,6 @@ /* select serial console configuration */ #define CONFIG_SERIAL2 -#define CONFIG_BAUDRATE 115200 /* Console configuration */ diff --git a/include/configs/sandbox.h b/include/configs/sandbox.h index ac7973c..6b3cd18 100644 --- a/include/configs/sandbox.h +++ b/include/configs/sandbox.h @@ -44,7 +44,6 @@ #define CONFIG_CMD_CBFS #define CONFIG_CMD_CRAMFS #define CONFIG_HOST_MAX_DEVICES 4 -#define CONFIG_CMD_MD5SUM /* * Size of malloc() pool, before and after relocation @@ -87,7 +86,6 @@ #define CONFIG_SYS_MONITOR_BASE 0 #define CONFIG_NR_DRAM_BANKS 1 -#define CONFIG_BAUDRATE 115200 #define CONFIG_SYS_BAUDRATE_TABLE {4800, 9600, 19200, 38400, 57600,\ 115200} diff --git a/include/configs/sbc8349.h b/include/configs/sbc8349.h index dc1978b..4d87f53 100644 --- a/include/configs/sbc8349.h +++ b/include/configs/sbc8349.h @@ -636,8 +636,6 @@ #undef CONFIG_BOOTARGS /* the boot command will set bootargs */ -#define CONFIG_BAUDRATE 115200 - #define CONFIG_EXTRA_ENV_SETTINGS \ "netdev=eth0\0" \ "hostname=sbc8349\0" \ diff --git a/include/configs/sbc8548.h b/include/configs/sbc8548.h index f5a5b61..e872e7f 100644 --- a/include/configs/sbc8548.h +++ b/include/configs/sbc8548.h @@ -569,8 +569,6 @@ #undef CONFIG_BOOTARGS /* the boot command will set bootargs*/ -#define CONFIG_BAUDRATE 115200 - #define CONFIG_EXTRA_ENV_SETTINGS \ "netdev=eth0\0" \ "uboot=" __stringify(CONFIG_UBOOTPATH) "\0" \ diff --git a/include/configs/sbc8641d.h b/include/configs/sbc8641d.h index ebd76ea..33b6d1f 100644 --- a/include/configs/sbc8641d.h +++ b/include/configs/sbc8641d.h @@ -518,8 +518,6 @@ #undef CONFIG_BOOTARGS /* the boot command will set bootargs */ -#define CONFIG_BAUDRATE 115200 - #define CONFIG_EXTRA_ENV_SETTINGS \ "netdev=eth0\0" \ "consoledev=ttyS0\0" \ diff --git a/include/configs/sh7752evb.h b/include/configs/sh7752evb.h index d818981..0cfcbab 100644 --- a/include/configs/sh7752evb.h +++ b/include/configs/sh7752evb.h @@ -16,10 +16,7 @@ #define CONFIG_CMD_DFL #define CONFIG_CMD_SDRAM -#define CONFIG_CMD_MD5SUM -#define CONFIG_MD5 -#define CONFIG_BAUDRATE 115200 #define CONFIG_BOOTARGS "console=ttySC2,115200 root=/dev/nfs ip=dhcp" #define CONFIG_DISPLAY_BOARDINFO diff --git a/include/configs/sh7753evb.h b/include/configs/sh7753evb.h index a7d8de4..58aad05 100644 --- a/include/configs/sh7753evb.h +++ b/include/configs/sh7753evb.h @@ -16,10 +16,7 @@ #define CONFIG_CMD_DFL #define CONFIG_CMD_SDRAM -#define CONFIG_CMD_MD5SUM -#define CONFIG_MD5 -#define CONFIG_BAUDRATE 115200 #define CONFIG_BOOTARGS "console=ttySC2,115200 root=/dev/nfs ip=dhcp" #define CONFIG_DISPLAY_BOARDINFO diff --git a/include/configs/sh7757lcr.h b/include/configs/sh7757lcr.h index c21a5f8..e9cd3d7 100644 --- a/include/configs/sh7757lcr.h +++ b/include/configs/sh7757lcr.h @@ -16,10 +16,7 @@ #define CONFIG_SYS_TEXT_BASE 0x8ef80000 #define CONFIG_CMD_SDRAM -#define CONFIG_CMD_MD5SUM -#define CONFIG_MD5 -#define CONFIG_BAUDRATE 115200 #define CONFIG_BOOTARGS "console=ttySC2,115200 root=/dev/nfs ip=dhcp" #define CONFIG_DISPLAY_BOARDINFO diff --git a/include/configs/sh7763rdp.h b/include/configs/sh7763rdp.h index 6124826..69073e8 100644 --- a/include/configs/sh7763rdp.h +++ b/include/configs/sh7763rdp.h @@ -28,7 +28,6 @@ /* SCIF */ #define CONFIG_SCIF_CONSOLE 1 -#define CONFIG_BAUDRATE 115200 #define CONFIG_CONS_SCIF2 1 #define CONFIG_SYS_TEXT_BASE 0x8FFC0000 diff --git a/include/configs/sh7785lcr.h b/include/configs/sh7785lcr.h index 1c3b701..ab304280 100644 --- a/include/configs/sh7785lcr.h +++ b/include/configs/sh7785lcr.h @@ -16,7 +16,6 @@ #define CONFIG_CMD_SDRAM #define CONFIG_CMD_SH_ZIMAGEBOOT -#define CONFIG_BAUDRATE 115200 #define CONFIG_BOOTARGS "console=ttySC1,115200 root=/dev/nfs ip=dhcp" #define CONFIG_EXTRA_ENV_SETTINGS \ diff --git a/include/configs/shmin.h b/include/configs/shmin.h index dde6625..bc1eba3 100644 --- a/include/configs/shmin.h +++ b/include/configs/shmin.h @@ -18,7 +18,6 @@ #define CONFIG_CMD_SDRAM #define CONFIG_CMD_ENV -#define CONFIG_BAUDRATE 115200 #define CONFIG_BOOTARGS "console=ttySC0,115200" /* diff --git a/include/configs/siemens-am33x-common.h b/include/configs/siemens-am33x-common.h index 34e124f..5a9ec02 100644 --- a/include/configs/siemens-am33x-common.h +++ b/include/configs/siemens-am33x-common.h @@ -100,8 +100,6 @@ #define CONFIG_SYS_NS16550_COM1 0x44e09000 #define CONFIG_SYS_NS16550_COM4 0x481a6000 -#define CONFIG_BAUDRATE 115200 - #define CONFIG_SERIAL1 1 #define CONFIG_CONS_INDEX 1 diff --git a/include/configs/smartweb.h b/include/configs/smartweb.h index f53f5d8..e09dfe6 100644 --- a/include/configs/smartweb.h +++ b/include/configs/smartweb.h @@ -112,7 +112,6 @@ #define CONFIG_ATMEL_USART #define CONFIG_USART_BASE ATMEL_BASE_DBGU #define CONFIG_USART_ID ATMEL_ID_SYS -#define CONFIG_BAUDRATE 115200 /* * Ethernet configuration @@ -270,7 +269,6 @@ #define CONFIG_SYS_AT91_PLLB 0x10483f0e #if defined(CONFIG_SPL_BUILD) -#define CONFIG_SYS_THUMB_BUILD #define CONFIG_SYS_ICACHE_OFF #define CONFIG_SYS_DCACHE_OFF #endif diff --git a/include/configs/smdkc100.h b/include/configs/smdkc100.h index a7c43b0..ab75504 100644 --- a/include/configs/smdkc100.h +++ b/include/configs/smdkc100.h @@ -55,7 +55,6 @@ /* allow to overwrite serial and ethaddr */ #define CONFIG_ENV_OVERWRITE -#define CONFIG_BAUDRATE 115200 /*********************************************************** * Command definition diff --git a/include/configs/snapper9260.h b/include/configs/snapper9260.h index a465a0e..d3e73f2 100644 --- a/include/configs/snapper9260.h +++ b/include/configs/snapper9260.h @@ -82,7 +82,6 @@ #define CONFIG_USART_BASE ATMEL_BASE_DBGU #define CONFIG_USART_ID ATMEL_ID_SYS #endif -#define CONFIG_BAUDRATE 115200 /* I2C - Bit-bashed */ #define CONFIG_SYS_I2C diff --git a/include/configs/snapper9g45.h b/include/configs/snapper9g45.h index c637ba1..952c6f5 100644 --- a/include/configs/snapper9g45.h +++ b/include/configs/snapper9g45.h @@ -81,7 +81,6 @@ /* UARTs/Serial console */ #define CONFIG_ATMEL_USART -#define CONFIG_BAUDRATE 115200 /* Boot options */ #define CONFIG_SYS_LOAD_ADDR 0x23000000 diff --git a/include/configs/sniper.h b/include/configs/sniper.h index 83fa6e0..6ddb83f 100644 --- a/include/configs/sniper.h +++ b/include/configs/sniper.h @@ -137,7 +137,6 @@ #define CONFIG_SYS_NS16550_COM3 OMAP34XX_UART3 #define CONFIG_CONS_INDEX 3 -#define CONFIG_BAUDRATE 115200 #define CONFIG_SYS_BAUDRATE_TABLE { 4800, 9600, 19200, 38400, 57600, \ 115200 } diff --git a/include/configs/socfpga_common.h b/include/configs/socfpga_common.h index 582b04a..8472b52 100644 --- a/include/configs/socfpga_common.h +++ b/include/configs/socfpga_common.h @@ -9,8 +9,6 @@ /* Virtual target or real hardware */ #undef CONFIG_SOCFPGA_VIRTUAL_TARGET -#define CONFIG_SYS_THUMB_BUILD - /* * High level configuration */ @@ -218,7 +216,6 @@ unsigned int cm_get_qspi_controller_clk_hz(void); #define CONFIG_SYS_NS16550_CLK 100000000 #endif #define CONFIG_CONS_INDEX 1 -#define CONFIG_BAUDRATE 115200 /* * USB diff --git a/include/configs/socfpga_de1_soc.h b/include/configs/socfpga_de1_soc.h index 2278357..c6e8d81 100644 --- a/include/configs/socfpga_de1_soc.h +++ b/include/configs/socfpga_de1_soc.h @@ -50,6 +50,4 @@ /* The rest of the configuration is shared */ #include <configs/socfpga_common.h> -#define CONFIG_SPL_ABORT_ON_RAW_IMAGE - #endif /* __CONFIG_TERASIC_DE1_SOC_H__ */ diff --git a/include/configs/socrates.h b/include/configs/socrates.h index 1bc5203..3f9c34b 100644 --- a/include/configs/socrates.h +++ b/include/configs/socrates.h @@ -185,8 +185,6 @@ #define CONFIG_SYS_NS16550_COM1 (CONFIG_SYS_CCSRBAR+0x4500) #define CONFIG_SYS_NS16550_COM2 (CONFIG_SYS_CCSRBAR+0x4600) -#define CONFIG_BAUDRATE 115200 - #define CONFIG_SYS_BAUDRATE_TABLE \ {300, 600, 1200, 2400, 4800, 9600, 19200, 38400,115200} diff --git a/include/configs/spear-common.h b/include/configs/spear-common.h index 77b80df..75fd27a 100644 --- a/include/configs/spear-common.h +++ b/include/configs/spear-common.h @@ -80,7 +80,6 @@ #define CONFIG_PL011_SERIAL #define CONFIG_PL011_CLOCK (48 * 1000 * 1000) #define CONFIG_CONS_INDEX 0 -#define CONFIG_BAUDRATE 115200 #define CONFIG_SYS_BAUDRATE_TABLE { 9600, 19200, 38400, \ 57600, 115200 } diff --git a/include/configs/stih410-b2260.h b/include/configs/stih410-b2260.h index 28e2f7f..6f4070f 100644 --- a/include/configs/stih410-b2260.h +++ b/include/configs/stih410-b2260.h @@ -18,13 +18,8 @@ #define CONFIG_SYS_TEXT_BASE 0x7D600000 #define CONFIG_SYS_LOAD_ADDR PHYS_SDRAM_1 /* default load addr */ -#define CONFIG_BAUDRATE 115200 - #define CONFIG_SYS_HZ_CLOCK 1000000000 /* 1 GHz */ -/* Libraries */ -#define CONFIG_MD5 - #define CONFIG_BOOTARGS \ "console=ttyS0,115200 earlyprintk consoleblank=0 ignore_loglevel" diff --git a/include/configs/stm32f429-discovery.h b/include/configs/stm32f429-discovery.h index 69135ff..a456e45 100644 --- a/include/configs/stm32f429-discovery.h +++ b/include/configs/stm32f429-discovery.h @@ -8,7 +8,6 @@ #ifndef __CONFIG_H #define __CONFIG_H -#define CONFIG_SYS_THUMB_BUILD #define CONFIG_STM32F4DISCOVERY #define CONFIG_MISC_INIT_R @@ -69,7 +68,6 @@ #define CONFIG_STACKSIZE (64 << 10) -#define CONFIG_BAUDRATE 115200 #define CONFIG_BOOTARGS \ "console=ttyS0,115200 earlyprintk consoleblank=0 ignore_loglevel" #define CONFIG_BOOTCOMMAND \ diff --git a/include/configs/stm32f746-disco.h b/include/configs/stm32f746-disco.h index ae3211a..55280f2 100644 --- a/include/configs/stm32f746-disco.h +++ b/include/configs/stm32f746-disco.h @@ -8,8 +8,6 @@ #ifndef __CONFIG_H #define __CONFIG_H -#define CONFIG_SYS_THUMB_BUILD - #define CONFIG_SYS_FLASH_BASE 0x08000000 #define CONFIG_SYS_INIT_SP_ADDR 0x20050000 #define CONFIG_SYS_TEXT_BASE 0x08000000 @@ -62,7 +60,6 @@ #define CONFIG_SYS_MALLOC_LEN (1 * 1024 * 1024) #define CONFIG_STACKSIZE (256 * 1024) -#define CONFIG_BAUDRATE 115200 #define CONFIG_BOOTARGS \ "console=ttyS0,115200 earlyprintk consoleblank=0 ignore_loglevel" #define CONFIG_BOOTCOMMAND \ diff --git a/include/configs/strider.h b/include/configs/strider.h index f65e602..1298808 100644 --- a/include/configs/strider.h +++ b/include/configs/strider.h @@ -632,8 +632,6 @@ void fpga_control_clear(unsigned int bus, int pin); #define CONFIG_HAS_ETH0 #endif -#define CONFIG_BAUDRATE 115200 - #define CONFIG_LOADADDR 800000 /* default location for tftp and bootm */ diff --git a/include/configs/stv0991.h b/include/configs/stv0991.h index 24dd818..2f808c6 100644 --- a/include/configs/stv0991.h +++ b/include/configs/stv0991.h @@ -28,7 +28,6 @@ #define CONFIG_SYS_MALLOC_LEN (CONFIG_ENV_SIZE + 16 * 1024) /* serial port (PL011) configuration */ -#define CONFIG_BAUDRATE 115200 #define CONFIG_PL01X_SERIAL /* user interface */ diff --git a/include/configs/sunxi-common.h b/include/configs/sunxi-common.h index d48bdac..05ea172 100644 --- a/include/configs/sunxi-common.h +++ b/include/configs/sunxi-common.h @@ -32,13 +32,6 @@ # define CONFIG_MACH_TYPE_COMPAT_REV 1 #endif -/* - * High Level Configuration Options - */ -#if defined(CONFIG_SPL_BUILD) && !defined(CONFIG_ARM64) -#define CONFIG_SYS_THUMB_BUILD /* Thumbs mode to save space in SPL */ -#endif - /* Serial & console */ #define CONFIG_SYS_NS16550_SERIAL /* ns16550 reg in the low bits of cpu reg */ @@ -163,7 +156,6 @@ #define CONFIG_STANDALONE_LOAD_ADDR CONFIG_SYS_LOAD_ADDR /* baudrate */ -#define CONFIG_BAUDRATE 115200 /* The stack sizes are set up in start.S using the settings below */ #define CONFIG_STACKSIZE (256 << 10) /* 256 KiB */ diff --git a/include/configs/t4qds.h b/include/configs/t4qds.h index 7803a84..55b8e3e 100644 --- a/include/configs/t4qds.h +++ b/include/configs/t4qds.h @@ -286,8 +286,6 @@ /* default location for tftp and bootm */ #define CONFIG_LOADADDR 1000000 -#define CONFIG_BAUDRATE 115200 - #define CONFIG_HVBOOT \ "setenv bootargs config-addr=0x60000000; " \ "bootm 0x01000000 - 0x00f00000" diff --git a/include/configs/tam3517-common.h b/include/configs/tam3517-common.h index 2704319..b1625b7 100644 --- a/include/configs/tam3517-common.h +++ b/include/configs/tam3517-common.h @@ -66,7 +66,6 @@ /* allow to overwrite serial and ethaddr */ #define CONFIG_ENV_OVERWRITE -#define CONFIG_BAUDRATE 115200 #define CONFIG_SYS_BAUDRATE_TABLE {4800, 9600, 19200, 38400, 57600,\ 115200} /* EHCI */ diff --git a/include/configs/tao3530.h b/include/configs/tao3530.h index ead8ea7..035a932 100644 --- a/include/configs/tao3530.h +++ b/include/configs/tao3530.h @@ -63,7 +63,6 @@ /* allow to overwrite serial and ethaddr */ #define CONFIG_ENV_OVERWRITE -#define CONFIG_BAUDRATE 115200 /* GPIO banks */ #define CONFIG_OMAP3_GPIO_2 /* GPIO32 ..63 is in GPIO bank 2 */ diff --git a/include/configs/taurus.h b/include/configs/taurus.h index ba7346c..4505be8 100644 --- a/include/configs/taurus.h +++ b/include/configs/taurus.h @@ -23,7 +23,6 @@ #include <linux/sizes.h> #if defined(CONFIG_SPL_BUILD) -#define CONFIG_SYS_THUMB_BUILD #define CONFIG_SYS_ICACHE_OFF #define CONFIG_SYS_DCACHE_OFF #endif @@ -56,7 +55,6 @@ #define CONFIG_ATMEL_USART #define CONFIG_USART_BASE ATMEL_BASE_DBGU #define CONFIG_USART_ID ATMEL_ID_SYS -#define CONFIG_BAUDRATE 115200 /* diff --git a/include/configs/tb100.h b/include/configs/tb100.h index 15d7762..b719943 100644 --- a/include/configs/tb100.h +++ b/include/configs/tb100.h @@ -35,7 +35,6 @@ */ #define CONFIG_SYS_NS16550_SERIAL #define CONFIG_SYS_NS16550_CLK 166666666 -#define CONFIG_BAUDRATE 115200 /* * Ethernet PHY configuration diff --git a/include/configs/tbs2910.h b/include/configs/tbs2910.h index 09a7942..dc6db17 100644 --- a/include/configs/tbs2910.h +++ b/include/configs/tbs2910.h @@ -12,7 +12,6 @@ #include "mx6_common.h" /* General configuration */ -#define CONFIG_SYS_THUMB_BUILD #define CONFIG_MACH_TYPE 3980 @@ -42,7 +41,6 @@ /* Serial console */ #define CONFIG_MXC_UART #define CONFIG_MXC_UART_BASE UART1_BASE /* select UART1/UART2 */ -#define CONFIG_BAUDRATE 115200 #define CONFIG_CONS_INDEX 1 diff --git a/include/configs/tcm-bf518.h b/include/configs/tcm-bf518.h index e017ba9..7924c8e 100644 --- a/include/configs/tcm-bf518.h +++ b/include/configs/tcm-bf518.h @@ -99,7 +99,6 @@ /* * Misc Settings */ -#define CONFIG_BAUDRATE 115200 #define CONFIG_RTC_BFIN #define CONFIG_UART_CONSOLE 0 #define CONFIG_BOOTCOMMAND "run flashboot" diff --git a/include/configs/tcm-bf537.h b/include/configs/tcm-bf537.h index 4d1cdb5..f9d9f84 100644 --- a/include/configs/tcm-bf537.h +++ b/include/configs/tcm-bf537.h @@ -123,7 +123,6 @@ /* * Misc Settings */ -#define CONFIG_BAUDRATE 115200 #define CONFIG_MISC_INIT_R #define CONFIG_RTC_BFIN #define CONFIG_UART_CONSOLE 0 diff --git a/include/configs/tegra-common.h b/include/configs/tegra-common.h index a96b2b5..c0462bc 100644 --- a/include/configs/tegra-common.h +++ b/include/configs/tegra-common.h @@ -49,7 +49,6 @@ /* allow to overwrite serial and ethaddr */ #define CONFIG_ENV_OVERWRITE -#define CONFIG_BAUDRATE 115200 /* turn on command-line edit/hist/auto */ #define CONFIG_COMMAND_HISTORY diff --git a/include/configs/thunderx_88xx.h b/include/configs/thunderx_88xx.h index 0e563fe..f52fc82 100644 --- a/include/configs/thunderx_88xx.h +++ b/include/configs/thunderx_88xx.h @@ -45,8 +45,6 @@ #define CONFIG_SYS_SERIAL0 0x87e024000000 #define CONFIG_SYS_SERIAL1 0x87e025000000 -#define CONFIG_BAUDRATE 115200 - /* BOOTP options */ #define CONFIG_BOOTP_BOOTFILESIZE #define CONFIG_BOOTP_BOOTPATH diff --git a/include/configs/ti814x_evm.h b/include/configs/ti814x_evm.h index c0b477d..319279e 100644 --- a/include/configs/ti814x_evm.h +++ b/include/configs/ti814x_evm.h @@ -135,8 +135,6 @@ #define CONFIG_SYS_NS16550_CLK (48000000) #define CONFIG_SYS_NS16550_COM1 0x48020000 /* Base EVM has UART0 */ -#define CONFIG_BAUDRATE 115200 - /* CPU */ #define CONFIG_ARCH_CPU_INIT diff --git a/include/configs/ti816x_evm.h b/include/configs/ti816x_evm.h index 951b842..2840467 100644 --- a/include/configs/ti816x_evm.h +++ b/include/configs/ti816x_evm.h @@ -97,8 +97,6 @@ #define CONFIG_SYS_NS16550_CLK (48000000) #define CONFIG_SYS_NS16550_COM1 0x48024000 /* Base EVM has UART2 */ -#define CONFIG_BAUDRATE 115200 - /* allow overwriting serial config and ethaddr */ #define CONFIG_ENV_OVERWRITE diff --git a/include/configs/ti_armv7_common.h b/include/configs/ti_armv7_common.h index fbe8859..a4ec4ce 100644 --- a/include/configs/ti_armv7_common.h +++ b/include/configs/ti_armv7_common.h @@ -175,7 +175,6 @@ * console baudrate of 115200 and use the default baud rate table. */ #define CONFIG_SYS_MALLOC_LEN SZ_32M -#define CONFIG_BAUDRATE 115200 #define CONFIG_ENV_VARS_UBOOT_CONFIG /* Strongly encouraged */ #define CONFIG_ENV_OVERWRITE /* Overwrite ethaddr / serial# */ @@ -278,8 +277,6 @@ #define CONFIG_CMD_SPL #endif -#define CONFIG_SYS_THUMB_BUILD - /* General parts of the framework, required. */ #define CONFIG_SPL_BOARD_INIT diff --git a/include/configs/ti_omap4_common.h b/include/configs/ti_omap4_common.h index 8e0f9eb..d07cb9f 100644 --- a/include/configs/ti_omap4_common.h +++ b/include/configs/ti_omap4_common.h @@ -18,8 +18,6 @@ #define CONFIG_OMAP4430 1 /* which is in a 4430 */ #define CONFIG_MISC_INIT_R -#define CONFIG_SYS_THUMB_BUILD - #ifndef CONFIG_SYS_L2CACHE_OFF #define CONFIG_SYS_L2_PL310 1 #define CONFIG_SYS_PL310_BASE 0x48242000 diff --git a/include/configs/tinker_rk3288.h b/include/configs/tinker_rk3288.h index 860eb40..c398e07 100644 --- a/include/configs/tinker_rk3288.h +++ b/include/configs/tinker_rk3288.h @@ -13,7 +13,7 @@ #undef BOOT_TARGET_DEVICES #define BOOT_TARGET_DEVICES(func) \ - func(MMC, mmc, 0) + func(MMC, mmc, 1) #define CONFIG_ENV_IS_IN_MMC #define CONFIG_SYS_MMC_ENV_DEV 0 diff --git a/include/configs/topic_miami.h b/include/configs/topic_miami.h index 42cfbb0..a56ceef 100644 --- a/include/configs/topic_miami.h +++ b/include/configs/topic_miami.h @@ -10,8 +10,6 @@ #ifndef __CONFIG_TOPIC_MIAMI_H #define __CONFIG_TOPIC_MIAMI_H -#define CONFIG_ZYNQ_PS_CLK_FREQ 33333333UL - #define CONFIG_ZYNQ_I2C0 #define CONFIG_ZYNQ_I2C1 diff --git a/include/configs/tplink_wdr4300.h b/include/configs/tplink_wdr4300.h index d428898..d39dd92 100644 --- a/include/configs/tplink_wdr4300.h +++ b/include/configs/tplink_wdr4300.h @@ -29,7 +29,6 @@ * Serial Port */ #define CONFIG_SYS_NS16550_CLK 40000000 -#define CONFIG_BAUDRATE 115200 #define CONFIG_SYS_BAUDRATE_TABLE \ {9600, 19200, 38400, 57600, 115200} diff --git a/include/configs/trats.h b/include/configs/trats.h index f027940..1e68c03 100644 --- a/include/configs/trats.h +++ b/include/configs/trats.h @@ -38,7 +38,6 @@ /* select serial console configuration */ #define CONFIG_SERIAL2 -#define CONFIG_BAUDRATE 115200 #define CONFIG_MACH_TYPE MACH_TYPE_TRATS diff --git a/include/configs/trats2.h b/include/configs/trats2.h index 1cd3e14..722d492 100644 --- a/include/configs/trats2.h +++ b/include/configs/trats2.h @@ -35,7 +35,6 @@ /* select serial console configuration */ #define CONFIG_SERIAL2 -#define CONFIG_BAUDRATE 115200 /* Console configuration */ diff --git a/include/configs/tricorder.h b/include/configs/tricorder.h index 2b80352..fc70be1 100644 --- a/include/configs/tricorder.h +++ b/include/configs/tricorder.h @@ -17,7 +17,6 @@ #define __CONFIG_H /* High Level Configuration Options */ -#define CONFIG_SYS_THUMB_BUILD #define CONFIG_OMAP /* in a TI OMAP core */ #define CONFIG_MACH_TYPE MACH_TYPE_TRICORDER @@ -67,7 +66,6 @@ #define CONFIG_CONS_INDEX 3 #define CONFIG_SYS_NS16550_COM3 OMAP34XX_UART3 #define CONFIG_SERIAL3 3 -#define CONFIG_BAUDRATE 115200 #define CONFIG_SYS_BAUDRATE_TABLE {4800, 9600, 19200, 38400, 57600,\ 115200} diff --git a/include/configs/ts4800.h b/include/configs/ts4800.h index 5649c18..a65c5f1 100644 --- a/include/configs/ts4800.h +++ b/include/configs/ts4800.h @@ -73,7 +73,6 @@ /* allow to overwrite serial and ethaddr */ #define CONFIG_ENV_OVERWRITE /* disable vendor parameters protection (serial#, ethaddr) */ #define CONFIG_CONS_INDEX 1 /* use UART0 : used by serial driver */ -#define CONFIG_BAUDRATE 115200 /*********************************************************** * Command definition diff --git a/include/configs/uniphier.h b/include/configs/uniphier.h index 2976d63..cdc5b00 100644 --- a/include/configs/uniphier.h +++ b/include/configs/uniphier.h @@ -57,7 +57,6 @@ #define CONFIG_SYS_MAX_FLASH_BANKS_DETECT 1 /* serial console configuration */ -#define CONFIG_BAUDRATE 115200 #define CONFIG_SYS_LONGHELP /* undef to save memory */ diff --git a/include/configs/usb_a9263.h b/include/configs/usb_a9263.h index 1462689..57e2220 100644 --- a/include/configs/usb_a9263.h +++ b/include/configs/usb_a9263.h @@ -42,7 +42,6 @@ #define CONFIG_ATMEL_USART #define CONFIG_USART_BASE ATMEL_BASE_DBGU #define CONFIG_USART_ID ATMEL_ID_SYS -#define CONFIG_BAUDRATE 115200 /* diff --git a/include/configs/usbarmory.h b/include/configs/usbarmory.h index 6c88829..a67802a 100644 --- a/include/configs/usbarmory.h +++ b/include/configs/usbarmory.h @@ -35,7 +35,6 @@ #define CONFIG_MXC_UART #define CONFIG_MXC_UART_BASE UART1_BASE #define CONFIG_CONS_INDEX 1 -#define CONFIG_BAUDRATE 115200 /* SD/MMC */ #define CONFIG_FSL_ESDHC diff --git a/include/configs/v38b.h b/include/configs/v38b.h index 08359d1..dc7186c 100644 --- a/include/configs/v38b.h +++ b/include/configs/v38b.h @@ -37,7 +37,6 @@ * Serial console configuration */ #define CONFIG_PSC_CONSOLE 1 /* console is on PSC1 */ -#define CONFIG_BAUDRATE 115200 /* ... at 115200 bps */ #define CONFIG_SYS_BAUDRATE_TABLE { 9600, 19200, 38400, 57600, 115200, 230400 } /* diff --git a/include/configs/vct.h b/include/configs/vct.h index c21c125..99cb311 100644 --- a/include/configs/vct.h +++ b/include/configs/vct.h @@ -54,7 +54,6 @@ #define CONFIG_SYS_NS16550_COM1 UART_1_BASE #define CONFIG_CONS_INDEX 1 #define CONFIG_SYS_NS16550_CLK 921600 -#define CONFIG_BAUDRATE 115200 /* * SDRAM diff --git a/include/configs/ve8313.h b/include/configs/ve8313.h index 564607e..f0e9a2e 100644 --- a/include/configs/ve8313.h +++ b/include/configs/ve8313.h @@ -459,8 +459,6 @@ #define CONFIG_HOSTNAME ve8313 #define CONFIG_UBOOTPATH ve8313/u-boot.bin -#define CONFIG_BAUDRATE 115200 - #define CONFIG_EXTRA_ENV_SETTINGS \ "netdev=" __stringify(CONFIG_NETDEV) "\0" \ "ethprime=" __stringify(CONFIG_TSEC1_NAME) "\0" \ diff --git a/include/configs/vexpress_aemv8a.h b/include/configs/vexpress_aemv8a.h index 35ac60a..ae13246 100644 --- a/include/configs/vexpress_aemv8a.h +++ b/include/configs/vexpress_aemv8a.h @@ -115,7 +115,6 @@ #endif /* PL011 Serial Configuration */ -#define CONFIG_BAUDRATE 115200 #define CONFIG_CONS_INDEX 0 #define CONFIG_PL01X_SERIAL #define CONFIG_PL011_SERIAL diff --git a/include/configs/vexpress_common.h b/include/configs/vexpress_common.h index 3756e22..0880b62 100644 --- a/include/configs/vexpress_common.h +++ b/include/configs/vexpress_common.h @@ -145,7 +145,6 @@ (void *)CONFIG_SYS_SERIAL1} #define CONFIG_CONS_INDEX 0 -#define CONFIG_BAUDRATE 38400 #define CONFIG_SYS_BAUDRATE_TABLE { 9600, 19200, 38400, 57600, 115200 } #define CONFIG_SYS_SERIAL0 V2M_UART0 #define CONFIG_SYS_SERIAL1 V2M_UART1 diff --git a/include/configs/vf610twr.h b/include/configs/vf610twr.h index b6407e9..ee90045 100644 --- a/include/configs/vf610twr.h +++ b/include/configs/vf610twr.h @@ -30,7 +30,6 @@ /* Allow to overwrite serial and ethaddr */ #define CONFIG_ENV_OVERWRITE -#define CONFIG_BAUDRATE 115200 /* NAND support */ #define CONFIG_CMD_NAND diff --git a/include/configs/vme8349.h b/include/configs/vme8349.h index 7724eea..738b13d 100644 --- a/include/configs/vme8349.h +++ b/include/configs/vme8349.h @@ -539,8 +539,6 @@ #undef CONFIG_BOOTARGS /* boot command will set bootargs */ -#define CONFIG_BAUDRATE 9600 - #define CONFIG_EXTRA_ENV_SETTINGS \ "netdev=eth0\0" \ "hostname=vme8349\0" \ diff --git a/include/configs/woodburn_common.h b/include/configs/woodburn_common.h index 7fec24c..3f837e8 100644 --- a/include/configs/woodburn_common.h +++ b/include/configs/woodburn_common.h @@ -68,7 +68,6 @@ /* allow to overwrite serial and ethaddr */ #define CONFIG_ENV_OVERWRITE #define CONFIG_CONS_INDEX 1 -#define CONFIG_BAUDRATE 115200 /* * Command definition diff --git a/include/configs/work_92105.h b/include/configs/work_92105.h index 6af0364..b35ba55 100644 --- a/include/configs/work_92105.h +++ b/include/configs/work_92105.h @@ -50,7 +50,6 @@ * Serial Driver */ #define CONFIG_SYS_LPC32XX_UART 5 /* UART5 - NS16550 */ -#define CONFIG_BAUDRATE 115200 /* * Ethernet Driver diff --git a/include/configs/x600.h b/include/configs/x600.h index 67c70f6..cf68374 100644 --- a/include/configs/x600.h +++ b/include/configs/x600.h @@ -16,7 +16,6 @@ */ #define CONFIG_SPEAR600 /* SPEAr600 SoC */ #define CONFIG_X600 /* on X600 board */ -#define CONFIG_SYS_THUMB_BUILD #include <asm/arch/hardware.h> @@ -44,7 +43,6 @@ #define CONFIG_PL011_SERIAL #define CONFIG_PL011_CLOCK (48 * 1000 * 1000) #define CONFIG_CONS_INDEX 0 -#define CONFIG_BAUDRATE 115200 #define CONFIG_SYS_BAUDRATE_TABLE { 9600, 19200, 38400, \ 57600, 115200 } #define CONFIG_SYS_LOADS_BAUD_CHANGE diff --git a/include/configs/x86-common.h b/include/configs/x86-common.h index a6ad18e..f7796cf 100644 --- a/include/configs/x86-common.h +++ b/include/configs/x86-common.h @@ -56,7 +56,6 @@ /*----------------------------------------------------------------------- * Serial Configuration */ -#define CONFIG_BAUDRATE 115200 #define CONFIG_SYS_BAUDRATE_TABLE {300, 600, 1200, 2400, 4800, \ 9600, 19200, 38400, 115200} #define CONFIG_SYS_NS16550_PORT_MAPPED diff --git a/include/configs/xilinx-ppc.h b/include/configs/xilinx-ppc.h index 58cfe41..2afc645 100644 --- a/include/configs/xilinx-ppc.h +++ b/include/configs/xilinx-ppc.h @@ -87,7 +87,6 @@ #define CONFIG_ENV_IS_NOWHERE #endif -#define CONFIG_BAUDRATE 115200 /* The following table includes the supported baudrates */ # define CONFIG_SYS_BAUDRATE_TABLE \ {300, 600, 1200, 2400, 4800, 9600, 19200, 38400, 57600, 115200, 230400} diff --git a/include/configs/xilinx_zynqmp.h b/include/configs/xilinx_zynqmp.h index ba79943..30b5b34 100644 --- a/include/configs/xilinx_zynqmp.h +++ b/include/configs/xilinx_zynqmp.h @@ -48,7 +48,6 @@ #define CONFIG_ZYNQ_SERIAL #define CONFIG_CONS_INDEX 0 -#define CONFIG_BAUDRATE 115200 #define CONFIG_SYS_BAUDRATE_TABLE \ { 4800, 9600, 19200, 38400, 57600, 115200 } diff --git a/include/configs/xpedite1000.h b/include/configs/xpedite1000.h index 45436c8..ba8eebe 100644 --- a/include/configs/xpedite1000.h +++ b/include/configs/xpedite1000.h @@ -101,7 +101,6 @@ extern void out32(unsigned int, unsigned long); #define CONFIG_SYS_BAUDRATE_TABLE \ {300, 600, 1200, 2400, 4800, 9600, 19200, 38400} -#define CONFIG_BAUDRATE 115200 #define CONFIG_LOADS_ECHO 1 /* echo on for serial download */ #define CONFIG_SYS_LOADS_BAUD_CHANGE 1 /* allow baudrate change */ diff --git a/include/configs/xpedite517x.h b/include/configs/xpedite517x.h index 0d5b1ff..d004148 100644 --- a/include/configs/xpedite517x.h +++ b/include/configs/xpedite517x.h @@ -213,7 +213,6 @@ extern unsigned long get_board_sys_clk(unsigned long dummy); #define CONFIG_SYS_NS16550_COM2 (CONFIG_SYS_CCSRBAR+0x4600) #define CONFIG_SYS_BAUDRATE_TABLE \ {300, 600, 1200, 2400, 4800, 9600, 19200, 38400, 115200} -#define CONFIG_BAUDRATE 115200 #define CONFIG_LOADS_ECHO 1 /* echo on for serial download */ #define CONFIG_SYS_LOADS_BAUD_CHANGE 1 /* allow baudrate change */ diff --git a/include/configs/xpedite520x.h b/include/configs/xpedite520x.h index b88aeb4..696ac88 100644 --- a/include/configs/xpedite520x.h +++ b/include/configs/xpedite520x.h @@ -175,7 +175,6 @@ #define CONFIG_SYS_NS16550_COM2 (CONFIG_SYS_CCSRBAR+0x4600) #define CONFIG_SYS_BAUDRATE_TABLE \ {300, 600, 1200, 2400, 4800, 9600, 19200, 38400, 115200} -#define CONFIG_BAUDRATE 115200 #define CONFIG_LOADS_ECHO 1 /* echo on for serial download */ #define CONFIG_SYS_LOADS_BAUD_CHANGE 1 /* allow baudrate change */ diff --git a/include/configs/xpedite537x.h b/include/configs/xpedite537x.h index 2f133d2..9c48e5e 100644 --- a/include/configs/xpedite537x.h +++ b/include/configs/xpedite537x.h @@ -209,7 +209,6 @@ extern unsigned long get_board_ddr_clk(unsigned long dummy); #define CONFIG_SYS_NS16550_COM2 (CONFIG_SYS_CCSRBAR+0x4600) #define CONFIG_SYS_BAUDRATE_TABLE \ {300, 600, 1200, 2400, 4800, 9600, 19200, 38400, 115200} -#define CONFIG_BAUDRATE 115200 #define CONFIG_LOADS_ECHO 1 /* echo on for serial download */ #define CONFIG_SYS_LOADS_BAUD_CHANGE 1 /* allow baudrate change */ diff --git a/include/configs/xpedite550x.h b/include/configs/xpedite550x.h index 4ac25a6..f8a1f4b 100644 --- a/include/configs/xpedite550x.h +++ b/include/configs/xpedite550x.h @@ -201,7 +201,6 @@ extern unsigned long get_board_ddr_clk(unsigned long dummy); #define CONFIG_SYS_NS16550_COM2 (CONFIG_SYS_CCSRBAR+0x4600) #define CONFIG_SYS_BAUDRATE_TABLE \ {300, 600, 1200, 2400, 4800, 9600, 19200, 38400, 115200} -#define CONFIG_BAUDRATE 115200 #define CONFIG_LOADS_ECHO 1 /* echo on for serial download */ #define CONFIG_SYS_LOADS_BAUD_CHANGE 1 /* allow baudrate change */ diff --git a/include/configs/xtfpga.h b/include/configs/xtfpga.h index c7862be..5169504 100644 --- a/include/configs/xtfpga.h +++ b/include/configs/xtfpga.h @@ -208,7 +208,6 @@ /* Input clk to NS16550 (in Hz; the SYS_CLK_FREQ is in kHz) */ #define CONFIG_SYS_NS16550_CLK CONFIG_SYS_CLK_FREQ #define CONFIG_CONS_INDEX 1 /* use UART0 for console */ -#define CONFIG_BAUDRATE 115200 /* Default baud rate */ #define CONFIG_SYS_BAUDRATE_TABLE { 9600, 19200, 38400, 57600, 115200 } /*======================*/ diff --git a/include/configs/zipitz2.h b/include/configs/zipitz2.h index 3df9a07..841cc6d 100644 --- a/include/configs/zipitz2.h +++ b/include/configs/zipitz2.h @@ -50,7 +50,6 @@ */ #define CONFIG_STUART 1 #define CONFIG_CONS_INDEX 2 -#define CONFIG_BAUDRATE 115200 /* * Bootloader Components Configuration diff --git a/include/configs/zmx25.h b/include/configs/zmx25.h index f669590..c61c353 100644 --- a/include/configs/zmx25.h +++ b/include/configs/zmx25.h @@ -54,7 +54,6 @@ #define CONFIG_MXC_UART #define CONFIG_MXC_UART_BASE UART2_BASE #define CONFIG_CONS_INDEX 1 /* use UART2 for console */ -#define CONFIG_BAUDRATE 115200 /* Default baud rate */ /* * Ethernet diff --git a/include/configs/zynq-common.h b/include/configs/zynq-common.h index 431d6c4..1fa5599 100644 --- a/include/configs/zynq-common.h +++ b/include/configs/zynq-common.h @@ -28,7 +28,6 @@ #define CONFIG_SYS_TIMER_COUNTER (CONFIG_SYS_TIMERBASE + 0x4) /* Serial drivers */ -#define CONFIG_BAUDRATE 115200 /* The following table includes the supported baudrates */ #define CONFIG_SYS_BAUDRATE_TABLE \ {300, 600, 1200, 2400, 4800, 9600, 19200, 38400, 57600, 115200, 230400} diff --git a/include/configs/zynq_zybo.h b/include/configs/zynq_zybo.h index b9ff391..1488fd8 100644 --- a/include/configs/zynq_zybo.h +++ b/include/configs/zynq_zybo.h @@ -20,9 +20,6 @@ #define CONFIG_DISPLAY #define CONFIG_I2C_EDID -/* Define ZYBO PS Clock Frequency to 50MHz */ -#define CONFIG_ZYNQ_PS_CLK_FREQ 50000000UL - #include <configs/zynq-common.h> #endif /* __CONFIG_ZYNQ_ZYBO_H */ diff --git a/include/dm/util.h b/include/dm/util.h index 15daa3d..45529ce 100644 --- a/include/dm/util.h +++ b/include/dm/util.h @@ -48,4 +48,30 @@ static inline void dm_dump_devres(void) } #endif +/** + * Check if a dt node should be or was bound before relocation. + * + * Devicetree nodes can be marked as needed to be bound + * in the loader stages via special devicetree properties. + * + * Before relocation this function can be used to check if nodes + * are required in either SPL or TPL stages. + * + * After relocation and jumping into the real U-Boot binary + * it is possible to determine if a node was bound in one of + * SPL/TPL stages. + * + * There are 3 settings currently in use + * - + * - u-boot,dm-pre-reloc: legacy and indicates any of TPL or SPL + * Existing platforms only use it to indicate nodes needee in + * SPL. Should probably be replaced by u-boot,dm-spl for + * existing platforms. + * @blob: devicetree + * @offset: node offset + * + * Returns true if node is needed in SPL/TL, false otherwise. + */ +bool dm_fdt_pre_reloc(const void *blob, int offset); + #endif diff --git a/include/dt-bindings/clock/rk3066a-cru.h b/include/dt-bindings/clock/rk3066a-cru.h new file mode 100644 index 0000000..549ae6a --- /dev/null +++ b/include/dt-bindings/clock/rk3066a-cru.h @@ -0,0 +1,32 @@ +/* + * Copyright (c) 2014 MundoReader S.L. + * Author: Heiko Stuebner <heiko@sntech.de> + * + * SPDX-License-Identifier: GPL-2.0+ + */ + +#ifndef _DT_BINDINGS_CLK_ROCKCHIP_RK3066A_H +#define _DT_BINDINGS_CLK_ROCKCHIP_RK3066A_H + +#include <dt-bindings/clock/rk3188-cru-common.h> + +/* soft-reset indices */ +#define SRST_SRST1 0 +#define SRST_SRST2 1 + +#define SRST_L2MEM 18 +#define SRST_I2S0 23 +#define SRST_I2S1 24 +#define SRST_I2S2 25 +#define SRST_TIMER2 29 + +#define SRST_GPIO4 36 +#define SRST_GPIO6 38 + +#define SRST_TSADC 92 + +#define SRST_HDMI 96 +#define SRST_HDMI_APB 97 +#define SRST_CIF1 111 + +#endif diff --git a/include/dt-bindings/clock/rk3188-cru-common.h b/include/dt-bindings/clock/rk3188-cru-common.h new file mode 100644 index 0000000..8fc818b --- /dev/null +++ b/include/dt-bindings/clock/rk3188-cru-common.h @@ -0,0 +1,256 @@ +/* + * Copyright (c) 2014 MundoReader S.L. + * Author: Heiko Stuebner <heiko@sntech.de> + * + * SPDX-License-Identifier: GPL-2.0+ + */ + +#ifndef _DT_BINDINGS_CLK_ROCKCHIP_RK3188_COMMON_H +#define _DT_BINDINGS_CLK_ROCKCHIP_RK3188_COMMON_H + +/* core clocks from */ +#define PLL_APLL 1 +#define PLL_DPLL 2 +#define PLL_CPLL 3 +#define PLL_GPLL 4 +#define CORE_PERI 5 +#define CORE_L2C 6 +#define ARMCLK 7 + +/* sclk gates (special clocks) */ +#define SCLK_UART0 64 +#define SCLK_UART1 65 +#define SCLK_UART2 66 +#define SCLK_UART3 67 +#define SCLK_MAC 68 +#define SCLK_SPI0 69 +#define SCLK_SPI1 70 +#define SCLK_SARADC 71 +#define SCLK_SDMMC 72 +#define SCLK_SDIO 73 +#define SCLK_EMMC 74 +#define SCLK_I2S0 75 +#define SCLK_I2S1 76 +#define SCLK_I2S2 77 +#define SCLK_SPDIF 78 +#define SCLK_CIF0 79 +#define SCLK_CIF1 80 +#define SCLK_OTGPHY0 81 +#define SCLK_OTGPHY1 82 +#define SCLK_HSADC 83 +#define SCLK_TIMER0 84 +#define SCLK_TIMER1 85 +#define SCLK_TIMER2 86 +#define SCLK_TIMER3 87 +#define SCLK_TIMER4 88 +#define SCLK_TIMER5 89 +#define SCLK_TIMER6 90 +#define SCLK_JTAG 91 +#define SCLK_SMC 92 +#define SCLK_TSADC 93 + +#define DCLK_LCDC0 190 +#define DCLK_LCDC1 191 + +/* aclk gates */ +#define ACLK_DMA1 192 +#define ACLK_DMA2 193 +#define ACLK_GPS 194 +#define ACLK_LCDC0 195 +#define ACLK_LCDC1 196 +#define ACLK_GPU 197 +#define ACLK_SMC 198 +#define ACLK_CIF 199 +#define ACLK_IPP 200 +#define ACLK_RGA 201 +#define ACLK_CIF0 202 +#define ACLK_CPU 203 +#define ACLK_PERI 204 + +/* pclk gates */ +#define PCLK_GRF 320 +#define PCLK_PMU 321 +#define PCLK_TIMER0 322 +#define PCLK_TIMER1 323 +#define PCLK_TIMER2 324 +#define PCLK_TIMER3 325 +#define PCLK_PWM01 326 +#define PCLK_PWM23 327 +#define PCLK_SPI0 328 +#define PCLK_SPI1 329 +#define PCLK_SARADC 330 +#define PCLK_WDT 331 +#define PCLK_UART0 332 +#define PCLK_UART1 333 +#define PCLK_UART2 334 +#define PCLK_UART3 335 +#define PCLK_I2C0 336 +#define PCLK_I2C1 337 +#define PCLK_I2C2 338 +#define PCLK_I2C3 339 +#define PCLK_I2C4 340 +#define PCLK_GPIO0 341 +#define PCLK_GPIO1 342 +#define PCLK_GPIO2 343 +#define PCLK_GPIO3 344 +#define PCLK_GPIO4 345 +#define PCLK_GPIO6 346 +#define PCLK_EFUSE 347 +#define PCLK_TZPC 348 +#define PCLK_TSADC 349 +#define PCLK_CPU 350 +#define PCLK_PERI 351 +#define PCLK_DDRUPCTL 352 +#define PCLK_PUBL 353 + +/* hclk gates */ +#define HCLK_SDMMC 448 +#define HCLK_SDIO 449 +#define HCLK_EMMC 450 +#define HCLK_OTG0 451 +#define HCLK_EMAC 452 +#define HCLK_SPDIF 453 +#define HCLK_I2S0 454 +#define HCLK_I2S1 455 +#define HCLK_I2S2 456 +#define HCLK_OTG1 457 +#define HCLK_HSIC 458 +#define HCLK_HSADC 459 +#define HCLK_PIDF 460 +#define HCLK_LCDC0 461 +#define HCLK_LCDC1 462 +#define HCLK_ROM 463 +#define HCLK_CIF0 464 +#define HCLK_IPP 465 +#define HCLK_RGA 466 +#define HCLK_NANDC0 467 +#define HCLK_CPU 468 +#define HCLK_PERI 469 + +#define CLK_NR_CLKS (HCLK_PERI + 1) + +/* soft-reset indices */ +#define SRST_MCORE 2 +#define SRST_CORE0 3 +#define SRST_CORE1 4 +#define SRST_MCORE_DBG 7 +#define SRST_CORE0_DBG 8 +#define SRST_CORE1_DBG 9 +#define SRST_CORE0_WDT 12 +#define SRST_CORE1_WDT 13 +#define SRST_STRC_SYS 14 +#define SRST_L2C 15 + +#define SRST_CPU_AHB 17 +#define SRST_AHB2APB 19 +#define SRST_DMA1 20 +#define SRST_INTMEM 21 +#define SRST_ROM 22 +#define SRST_SPDIF 26 +#define SRST_TIMER0 27 +#define SRST_TIMER1 28 +#define SRST_EFUSE 30 + +#define SRST_GPIO0 32 +#define SRST_GPIO1 33 +#define SRST_GPIO2 34 +#define SRST_GPIO3 35 + +#define SRST_UART0 39 +#define SRST_UART1 40 +#define SRST_UART2 41 +#define SRST_UART3 42 +#define SRST_I2C0 43 +#define SRST_I2C1 44 +#define SRST_I2C2 45 +#define SRST_I2C3 46 +#define SRST_I2C4 47 + +#define SRST_PWM0 48 +#define SRST_PWM1 49 +#define SRST_DAP_PO 50 +#define SRST_DAP 51 +#define SRST_DAP_SYS 52 +#define SRST_TPIU_ATB 53 +#define SRST_PMU_APB 54 +#define SRST_GRF 55 +#define SRST_PMU 56 +#define SRST_PERI_AXI 57 +#define SRST_PERI_AHB 58 +#define SRST_PERI_APB 59 +#define SRST_PERI_NIU 60 +#define SRST_CPU_PERI 61 +#define SRST_EMEM_PERI 62 +#define SRST_USB_PERI 63 + +#define SRST_DMA2 64 +#define SRST_SMC 65 +#define SRST_MAC 66 +#define SRST_NANC0 68 +#define SRST_USBOTG0 69 +#define SRST_USBPHY0 70 +#define SRST_OTGC0 71 +#define SRST_USBOTG1 72 +#define SRST_USBPHY1 73 +#define SRST_OTGC1 74 +#define SRST_HSADC 76 +#define SRST_PIDFILTER 77 +#define SRST_DDR_MSCH 79 + +#define SRST_TZPC 80 +#define SRST_SDMMC 81 +#define SRST_SDIO 82 +#define SRST_EMMC 83 +#define SRST_SPI0 84 +#define SRST_SPI1 85 +#define SRST_WDT 86 +#define SRST_SARADC 87 +#define SRST_DDRPHY 88 +#define SRST_DDRPHY_APB 89 +#define SRST_DDRCTL 90 +#define SRST_DDRCTL_APB 91 +#define SRST_DDRPUB 93 + +#define SRST_VIO0_AXI 98 +#define SRST_VIO0_AHB 99 +#define SRST_LCDC0_AXI 100 +#define SRST_LCDC0_AHB 101 +#define SRST_LCDC0_DCLK 102 +#define SRST_LCDC1_AXI 103 +#define SRST_LCDC1_AHB 104 +#define SRST_LCDC1_DCLK 105 +#define SRST_IPP_AXI 106 +#define SRST_IPP_AHB 107 +#define SRST_RGA_AXI 108 +#define SRST_RGA_AHB 109 +#define SRST_CIF0 110 + +#define SRST_VCODEC_AXI 112 +#define SRST_VCODEC_AHB 113 +#define SRST_VIO1_AXI 114 +#define SRST_VCODEC_CPU 115 +#define SRST_VCODEC_NIU 116 +#define SRST_GPU 120 +#define SRST_GPU_NIU 122 +#define SRST_TFUN_ATB 125 +#define SRST_TFUN_APB 126 +#define SRST_CTI4_APB 127 + +#define SRST_TPIU_APB 128 +#define SRST_TRACE 129 +#define SRST_CORE_DBG 130 +#define SRST_DBG_APB 131 +#define SRST_CTI0 132 +#define SRST_CTI0_APB 133 +#define SRST_CTI1 134 +#define SRST_CTI1_APB 135 +#define SRST_PTM_CORE0 136 +#define SRST_PTM_CORE1 137 +#define SRST_PTM0 138 +#define SRST_PTM0_ATB 139 +#define SRST_PTM1 140 +#define SRST_PTM1_ATB 141 +#define SRST_CTM 142 +#define SRST_TS 143 + +#endif diff --git a/include/dt-bindings/clock/rk3188-cru.h b/include/dt-bindings/clock/rk3188-cru.h new file mode 100644 index 0000000..b6960b0 --- /dev/null +++ b/include/dt-bindings/clock/rk3188-cru.h @@ -0,0 +1,48 @@ +/* + * Copyright (c) 2014 MundoReader S.L. + * Author: Heiko Stuebner <heiko@sntech.de> + * + * SPDX-License-Identifier: GPL-2.0+ + */ + +#ifndef _DT_BINDINGS_CLK_ROCKCHIP_RK3188_H +#define _DT_BINDINGS_CLK_ROCKCHIP_RK3188_H + +#include <dt-bindings/clock/rk3188-cru-common.h> + +/* soft-reset indices */ +#define SRST_PTM_CORE2 0 +#define SRST_PTM_CORE3 1 +#define SRST_CORE2 5 +#define SRST_CORE3 6 +#define SRST_CORE2_DBG 10 +#define SRST_CORE3_DBG 11 + +#define SRST_TIMER2 16 +#define SRST_TIMER4 23 +#define SRST_I2S0 24 +#define SRST_TIMER5 25 +#define SRST_TIMER3 29 +#define SRST_TIMER6 31 + +#define SRST_PTM3 36 +#define SRST_PTM3_ATB 37 + +#define SRST_GPS 67 +#define SRST_HSICPHY 75 +#define SRST_TIMER 78 + +#define SRST_PTM2 92 +#define SRST_CORE2_WDT 94 +#define SRST_CORE3_WDT 95 + +#define SRST_PTM2_ATB 111 + +#define SRST_HSIC 117 +#define SRST_CTI2 118 +#define SRST_CTI2_APB 119 +#define SRST_GPU_BRIDGE 121 +#define SRST_CTI3 123 +#define SRST_CTI3_APB 124 + +#endif diff --git a/include/dt-bindings/clock/rk3328-cru.h b/include/dt-bindings/clock/rk3328-cru.h new file mode 100644 index 0000000..6d8bf13 --- /dev/null +++ b/include/dt-bindings/clock/rk3328-cru.h @@ -0,0 +1,394 @@ +/* + * (C) Copyright 2016 Rockchip Electronics Co., Ltd + * + * SPDX-License-Identifier: GPL-2.0+ + */ + +#ifndef _DT_BINDINGS_CLK_ROCKCHIP_RK3328_H +#define _DT_BINDINGS_CLK_ROCKCHIP_RK3328_H + +/* core clocks */ +#define PLL_APLL 1 +#define PLL_DPLL 2 +#define PLL_CPLL 3 +#define PLL_GPLL 4 +#define PLL_NPLL 5 +#define ARMCLK 6 + +/* sclk gates (special clocks) */ +#define SCLK_RTC32K 30 +#define SCLK_SDMMC_EXT 31 +#define SCLK_SPI 32 +#define SCLK_SDMMC 33 +#define SCLK_SDIO 34 +#define SCLK_EMMC 35 +#define SCLK_TSADC 36 +#define SCLK_SARADC 37 +#define SCLK_UART0 38 +#define SCLK_UART1 39 +#define SCLK_UART2 40 +#define SCLK_I2S0 41 +#define SCLK_I2S1 42 +#define SCLK_I2S2 43 +#define SCLK_I2S1_OUT 44 +#define SCLK_I2S2_OUT 45 +#define SCLK_SPDIF 46 +#define SCLK_TIMER0 47 +#define SCLK_TIMER1 48 +#define SCLK_TIMER2 49 +#define SCLK_TIMER3 50 +#define SCLK_TIMER4 51 +#define SCLK_TIMER5 52 +#define SCLK_WIFI 53 +#define SCLK_CIF_OUT 54 +#define SCLK_I2C0 55 +#define SCLK_I2C1 56 +#define SCLK_I2C2 57 +#define SCLK_I2C3 58 +#define SCLK_CRYPTO 59 +#define SCLK_PWM 60 +#define SCLK_PDM 61 +#define SCLK_EFUSE 62 +#define SCLK_OTP 63 +#define SCLK_DDRCLK 64 +#define SCLK_VDEC_CABAC 65 +#define SCLK_VDEC_CORE 66 +#define SCLK_VENC_DSP 67 +#define SCLK_VENC_CORE 68 +#define SCLK_RGA 69 +#define SCLK_HDMI_SFC 70 +#define SCLK_HDMI_CEC 71 +#define SCLK_USB3_REF 72 +#define SCLK_USB3_SUSPEND 73 +#define SCLK_SDMMC_DRV 74 +#define SCLK_SDIO_DRV 75 +#define SCLK_EMMC_DRV 76 +#define SCLK_SDMMC_EXT_DRV 77 +#define SCLK_SDMMC_SAMPLE 78 +#define SCLK_SDIO_SAMPLE 79 +#define SCLK_EMMC_SAMPLE 80 +#define SCLK_SDMMC_EXT_SAMPLE 81 +#define SCLK_VOP 82 +#define SCLK_MAC2PHY_RXTX 83 +#define SCLK_MAC2PHY_SRC 84 +#define SCLK_MAC2PHY_REF 85 +#define SCLK_MAC2PHY_OUT 86 +#define SCLK_MAC2IO_RX 87 +#define SCLK_MAC2IO_TX 88 +#define SCLK_MAC2IO_REFOUT 89 +#define SCLK_MAC2IO_REF 90 +#define SCLK_MAC2IO_OUT 91 +#define SCLK_TSP 92 +#define SCLK_HSADC_TSP 93 +#define SCLK_USB3PHY_REF 94 +#define SCLK_REF_USB3OTG 95 +#define SCLK_USB3OTG_REF 96 +#define SCLK_USB3OTG_SUSPEND 97 +#define SCLK_REF_USB3OTG_SRC 98 +#define SCLK_MAC2IO_SRC 99 + +/* dclk gates */ +#define DCLK_LCDC 180 +#define DCLK_HDMIPHY 181 +#define HDMIPHY 182 +#define USB480M 183 +#define DCLK_LCDC_SRC 184 + +/* aclk gates */ +#define ACLK_AXISRAM 190 +#define ACLK_VOP_PRE 191 +#define ACLK_USB3OTG 192 +#define ACLK_RGA_PRE 193 +#define ACLK_DMAC 194 +#define ACLK_GPU 195 +#define ACLK_BUS_PRE 196 +#define ACLK_PERI_PRE 197 +#define ACLK_RKVDEC_PRE 198 +#define ACLK_RKVDEC 199 +#define ACLK_RKVENC 200 +#define ACLK_VPU_PRE 201 +#define ACLK_VIO_PRE 202 +#define ACLK_VPU 203 +#define ACLK_VIO 204 +#define ACLK_VOP 205 +#define ACLK_GMAC 206 +#define ACLK_H265 207 +#define ACLK_H264 208 +#define ACLK_MAC2PHY 209 +#define ACLK_MAC2IO 210 +#define ACLK_DCF 211 +#define ACLK_TSP 212 +#define ACLK_PERI 213 +#define ACLK_RGA 214 +#define ACLK_IEP 215 +#define ACLK_CIF 216 +#define ACLK_HDCP 217 + +/* pclk gates */ +#define PCLK_GPIO0 300 +#define PCLK_GPIO1 301 +#define PCLK_GPIO2 302 +#define PCLK_GPIO3 303 +#define PCLK_GRF 304 +#define PCLK_I2C0 305 +#define PCLK_I2C1 306 +#define PCLK_I2C2 307 +#define PCLK_I2C3 308 +#define PCLK_SPI 309 +#define PCLK_UART0 310 +#define PCLK_UART1 311 +#define PCLK_UART2 312 +#define PCLK_TSADC 313 +#define PCLK_PWM 314 +#define PCLK_TIMER 315 +#define PCLK_BUS_PRE 316 +#define PCLK_PERI_PRE 317 +#define PCLK_HDMI_CTRL 318 +#define PCLK_HDMI_PHY 319 +#define PCLK_GMAC 320 +#define PCLK_H265 321 +#define PCLK_MAC2PHY 322 +#define PCLK_MAC2IO 323 +#define PCLK_USB3PHY_OTG 324 +#define PCLK_USB3PHY_PIPE 325 +#define PCLK_USB3_GRF 326 +#define PCLK_USB2_GRF 327 +#define PCLK_HDMIPHY 328 +#define PCLK_DDR 329 +#define PCLK_PERI 330 +#define PCLK_HDMI 331 +#define PCLK_HDCP 332 +#define PCLK_DCF 333 +#define PCLK_SARADC 334 + +/* hclk gates */ +#define HCLK_PERI 408 +#define HCLK_TSP 409 +#define HCLK_GMAC 410 +#define HCLK_I2S0_8CH 411 +#define HCLK_I2S1_8CH 413 +#define HCLK_I2S2_2CH 413 +#define HCLK_SPDIF_8CH 414 +#define HCLK_VOP 415 +#define HCLK_NANDC 416 +#define HCLK_SDMMC 417 +#define HCLK_SDIO 418 +#define HCLK_EMMC 419 +#define HCLK_SDMMC_EXT 420 +#define HCLK_RKVDEC_PRE 421 +#define HCLK_RKVDEC 422 +#define HCLK_RKVENC 423 +#define HCLK_VPU_PRE 424 +#define HCLK_VIO_PRE 425 +#define HCLK_VPU 426 +#define HCLK_VIO 427 +#define HCLK_BUS_PRE 428 +#define HCLK_PERI_PRE 429 +#define HCLK_H264 430 +#define HCLK_CIF 431 +#define HCLK_OTG_PMU 432 +#define HCLK_OTG 433 +#define HCLK_HOST0 434 +#define HCLK_HOST0_ARB 435 +#define HCLK_CRYPTO_MST 436 +#define HCLK_CRYPTO_SLV 437 +#define HCLK_PDM 438 +#define HCLK_IEP 439 +#define HCLK_RGA 440 +#define HCLK_HDCP 441 + +#define CLK_NR_CLKS (HCLK_HDCP + 1) + +#define SCLK_MAC2IO 0 +#define SCLK_MAC2PHY 1 + +#define CLKGRF_NR_CLKS (SCLK_MAC2PHY + 1) + +/* soft-reset indices */ +#define SRST_CORE0_PO 0 +#define SRST_CORE1_PO 1 +#define SRST_CORE2_PO 2 +#define SRST_CORE3_PO 3 +#define SRST_CORE0 4 +#define SRST_CORE1 5 +#define SRST_CORE2 6 +#define SRST_CORE3 7 +#define SRST_CORE0_DBG 8 +#define SRST_CORE1_DBG 9 +#define SRST_CORE2_DBG 10 +#define SRST_CORE3_DBG 11 +#define SRST_TOPDBG 12 +#define SRST_CORE_NIU 13 +#define SRST_STRC_A 14 +#define SRST_L2C 15 + +#define SRST_A53_GIC 18 +#define SRST_DAP 19 +#define SRST_PMU_P 21 +#define SRST_EFUSE 22 +#define SRST_BUSSYS_H 23 +#define SRST_BUSSYS_P 24 +#define SRST_SPDIF 25 +#define SRST_INTMEM 26 +#define SRST_ROM 27 +#define SRST_GPIO0 28 +#define SRST_GPIO1 29 +#define SRST_GPIO2 30 +#define SRST_GPIO3 31 + +#define SRST_I2S0 32 +#define SRST_I2S1 33 +#define SRST_I2S2 34 +#define SRST_I2S0_H 35 +#define SRST_I2S1_H 36 +#define SRST_I2S2_H 37 +#define SRST_UART0 38 +#define SRST_UART1 39 +#define SRST_UART2 40 +#define SRST_UART0_P 41 +#define SRST_UART1_P 42 +#define SRST_UART2_P 43 +#define SRST_I2C0 44 +#define SRST_I2C1 45 +#define SRST_I2C2 46 +#define SRST_I2C3 47 + +#define SRST_I2C0_P 48 +#define SRST_I2C1_P 49 +#define SRST_I2C2_P 50 +#define SRST_I2C3_P 51 +#define SRST_EFUSE_SE_P 52 +#define SRST_EFUSE_NS_P 53 +#define SRST_PWM0 54 +#define SRST_PWM0_P 55 +#define SRST_DMA 56 +#define SRST_TSP_A 57 +#define SRST_TSP_H 58 +#define SRST_TSP 59 +#define SRST_TSP_HSADC 60 +#define SRST_DCF_A 61 +#define SRST_DCF_P 62 + +#define SRST_SCR 64 +#define SRST_SPI 65 +#define SRST_TSADC 66 +#define SRST_TSADC_P 67 +#define SRST_CRYPTO 68 +#define SRST_SGRF 69 +#define SRST_GRF 70 +#define SRST_USB_GRF 71 +#define SRST_TIMER_6CH_P 72 +#define SRST_TIMER0 73 +#define SRST_TIMER1 74 +#define SRST_TIMER2 75 +#define SRST_TIMER3 76 +#define SRST_TIMER4 77 +#define SRST_TIMER5 78 +#define SRST_USB3GRF 79 + +#define SRST_PHYNIU 80 +#define SRST_HDMIPHY 81 +#define SRST_VDAC 82 +#define SRST_ACODEC_p 83 +#define SRST_SARADC 85 +#define SRST_SARADC_P 86 +#define SRST_GRF_DDR 87 +#define SRST_DFIMON 88 +#define SRST_MSCH 89 +#define SRST_DDRMSCH 91 +#define SRST_DDRCTRL 92 +#define SRST_DDRCTRL_P 93 +#define SRST_DDRPHY 94 +#define SRST_DDRPHY_P 95 + +#define SRST_GMAC_NIU_A 96 +#define SRST_GMAC_NIU_P 97 +#define SRST_GMAC2PHY_A 98 +#define SRST_GMAC2IO_A 99 +#define SRST_MACPHY 100 +#define SRST_OTP_PHY 101 +#define SRST_GPU_A 102 +#define SRST_GPU_NIU_A 103 +#define SRST_SDMMCEXT 104 +#define SRST_PERIPH_NIU_A 105 +#define SRST_PERIHP_NIU_H 106 +#define SRST_PERIHP_P 107 +#define SRST_PERIPHSYS_H 108 +#define SRST_MMC0 109 +#define SRST_SDIO 110 +#define SRST_EMMC 111 + +#define SRST_USB2OTG_H 112 +#define SRST_USB2OTG 113 +#define SRST_USB2OTG_ADP 114 +#define SRST_USB2HOST_H 115 +#define SRST_USB2HOST_ARB 116 +#define SRST_USB2HOST_AUX 117 +#define SRST_USB2HOST_EHCIPHY 118 +#define SRST_USB2HOST_UTMI 119 +#define SRST_USB3OTG 120 +#define SRST_USBPOR 121 +#define SRST_USB2OTG_UTMI 122 +#define SRST_USB2HOST_PHY_UTMI 123 +#define SRST_USB3OTG_UTMI 124 +#define SRST_USB3PHY_U2 125 +#define SRST_USB3PHY_U3 126 +#define SRST_USB3PHY_PIPE 127 + +#define SRST_VIO_A 128 +#define SRST_VIO_BUS_H 129 +#define SRST_VIO_H2P_H 130 +#define SRST_VIO_ARBI_H 131 +#define SRST_VOP_NIU_A 132 +#define SRST_VOP_A 133 +#define SRST_VOP_H 134 +#define SRST_VOP_D 135 +#define SRST_RGA 136 +#define SRST_RGA_NIU_A 137 +#define SRST_RGA_A 138 +#define SRST_RGA_H 139 +#define SRST_IEP_A 140 +#define SRST_IEP_H 141 +#define SRST_HDMI 142 +#define SRST_HDMI_P 143 + +#define SRST_HDCP_A 144 +#define SRST_HDCP 145 +#define SRST_HDCP_H 146 +#define SRST_CIF_A 147 +#define SRST_CIF_H 148 +#define SRST_CIF_P 149 +#define SRST_OTP_P 150 +#define SRST_OTP_SBPI 151 +#define SRST_OTP_USER 152 +#define SRST_DDRCTRL_A 153 +#define SRST_DDRSTDY_P 154 +#define SRST_DDRSTDY 155 +#define SRST_PDM_H 156 +#define SRST_PDM 157 +#define SRST_USB3PHY_OTG_P 158 +#define SRST_USB3PHY_PIPE_P 159 + +#define SRST_VCODEC_A 160 +#define SRST_VCODEC_NIU_A 161 +#define SRST_VCODEC_H 162 +#define SRST_VCODEC_NIU_H 163 +#define SRST_VDEC_A 164 +#define SRST_VDEC_NIU_A 165 +#define SRST_VDEC_H 166 +#define SRST_VDEC_NIU_H 167 +#define SRST_VDEC_CORE 168 +#define SRST_VDEC_CABAC 169 +#define SRST_DDRPHYDIV 175 + +#define SRST_RKVENC_NIU_A 176 +#define SRST_RKVENC_NIU_H 177 +#define SRST_RKVENC_H265_A 178 +#define SRST_RKVENC_H265_P 179 +#define SRST_RKVENC_H265_CORE 180 +#define SRST_RKVENC_H265_DSP 181 +#define SRST_RKVENC_H264_A 182 +#define SRST_RKVENC_H264_H 183 +#define SRST_RKVENC_INTMEM 184 + +#endif diff --git a/include/dt-bindings/clock/rk3399-cru.h b/include/dt-bindings/clock/rk3399-cru.h index 0a86aec..d4bdcc6 100644 --- a/include/dt-bindings/clock/rk3399-cru.h +++ b/include/dt-bindings/clock/rk3399-cru.h @@ -122,6 +122,10 @@ #define SCLK_DPHY_RX0_CFG 165 #define SCLK_RMII_SRC 166 #define SCLK_PCIEPHY_REF100M 167 +#define SCLK_USBPHY0_480M_SRC 168 +#define SCLK_USBPHY1_480M_SRC 169 +#define SCLK_DDRCLK 170 +#define SCLK_TESTOUT2 171 #define DCLK_VOP0 180 #define DCLK_VOP1 181 @@ -589,13 +593,13 @@ #define SRST_P_SPI0 214 #define SRST_P_SPI1 215 #define SRST_P_SPI2 216 -#define SRST_P_SPI3 217 -#define SRST_P_SPI4 218 +#define SRST_P_SPI4 217 +#define SRST_P_SPI5 218 #define SRST_SPI0 219 #define SRST_SPI1 220 #define SRST_SPI2 221 -#define SRST_SPI3 222 -#define SRST_SPI4 223 +#define SRST_SPI4 222 +#define SRST_SPI5 223 /* cru_softrst_con14 */ #define SRST_I2S0_8CH 224 @@ -717,8 +721,8 @@ #define SRST_H_CM0S_NOC 3 #define SRST_DBG_CM0S 4 #define SRST_PO_CM0S 5 -#define SRST_P_SPI6 6 -#define SRST_SPI6 7 +#define SRST_P_SPI3 6 +#define SRST_SPI3 7 #define SRST_P_TIMER_0_1 8 #define SRST_P_TIMER_0 9 #define SRST_P_TIMER_1 10 diff --git a/include/dt-bindings/pinctrl/rockchip.h b/include/dt-bindings/pinctrl/rockchip.h index 56887e1..ecb76c7 100644 --- a/include/dt-bindings/pinctrl/rockchip.h +++ b/include/dt-bindings/pinctrl/rockchip.h @@ -22,5 +22,7 @@ #define RK_FUNC_2 2 #define RK_FUNC_3 3 #define RK_FUNC_4 4 +#define RK_FUNC_5 5 +#define RK_FUNC_6 6 #endif diff --git a/include/image.h b/include/image.h index 1e686b7..2372518 100644 --- a/include/image.h +++ b/include/image.h @@ -67,7 +67,6 @@ struct lmb; # endif # else # define CONFIG_CRC32 /* FIT images need CRC32 support */ -# define CONFIG_MD5 /* and MD5 */ # define CONFIG_SHA1 /* and SHA1 */ # define CONFIG_SHA256 /* and SHA256 */ # define IMAGE_ENABLE_CRC32 1 diff --git a/include/spl.h b/include/spl.h index bde4437..2e5b885 100644 --- a/include/spl.h +++ b/include/spl.h @@ -85,7 +85,7 @@ void spl_set_header_raw_uboot(struct spl_image_info *spl_image); * This parses the legacy image header information at @header and sets up * @spl_image according to what is found. If no image header is found, then * a raw image or bootz is assumed. If CONFIG_SPL_PANIC_ON_RAW_IMAGE is - * enabled, then this causes a panic. If CONFIG_SPL_ABORT_ON_RAW_IMAGE is + * enabled, then this causes a panic. If CONFIG_SPL_RAW_IMAGE_SUPPORT is not * enabled then U-Boot gives up. Otherwise U-Boot sets up the image using * spl_set_header_raw_uboot(), or possibly the bootz header. * @@ -213,11 +213,29 @@ int spl_load_image_ext_os(struct spl_image_info *spl_image, struct blk_desc *block_dev, int partition); /** - * spl_init() - Set up device tree and driver model in SPL if enabled + * spl_early_init() - Set up device tree and driver model in SPL if enabled * * Call this function in board_init_f() if you want to use device tree and - * driver model early, before board_init_r() is called. This function will - * be called from board_init_r() if not called earlier. + * driver model early, before board_init_r() is called. + * + * If this is not called, then driver model will be inactive in SPL's + * board_init_f(), and no device tree will be available. + */ +int spl_early_init(void); + +/** + * spl_init() - Set up device tree and driver model in SPL if enabled + * + * You can optionally call spl_early_init(), then optionally call spl_init(). + * This function will be called from board_init_r() if not called earlier. + * + * Both spl_early_init() and spl_init() perform a similar function except that + * the latter will not set up the malloc() area if + * CONFIG_SPL_STACK_R_MALLOC_SIMPLE_LEN is enabled, since it is assumed to + * already be done by a calll to spl_relocate_stack_gd() before board_init_r() + * is reached. + * + * This function will be called from board_init_r() if not called earlier. * * If this is not called, then driver model will be inactive in SPL's * board_init_f(), and no device tree will be available. |