mirror of
https://github.com/AsahiLinux/u-boot
synced 2024-11-10 15:14:43 +00:00
treewide: configs: fold CONFIG_DEFAULT_CONSOLE
In prepartion to remove CONFIG_DEFAULT_CONSOLE, fold the current users. Signed-off-by: Andre Heider <a.heider@gmail.com> Acked-by: Krzysztof Kozlowski <krzk@kernel.org> Reviewed-by: Simon Glass <sjg@chromium.org> Signed-off-by: Minkyu Kang <mk7.kang@samsung.com>
This commit is contained in:
parent
ac79cfc2a4
commit
9c04265f76
6 changed files with 6 additions and 34 deletions
|
@ -33,12 +33,7 @@
|
|||
|
||||
#include <linux/sizes.h>
|
||||
|
||||
/* select serial console configuration */
|
||||
|
||||
/* Console configuration */
|
||||
|
||||
#define CONFIG_BOOTCOMMAND "run distro_bootcmd ; run autoboot"
|
||||
#define CONFIG_DEFAULT_CONSOLE "console=ttySAC1,115200n8\0"
|
||||
|
||||
#define CONFIG_SYS_INIT_SP_ADDR (CONFIG_SYS_LOAD_ADDR \
|
||||
- GENERATED_GBL_DATA_SIZE)
|
||||
|
@ -149,7 +144,7 @@
|
|||
"elif test -e mmc ${mmcbootdev} uImage; then; " \
|
||||
"run boot_uimg;" \
|
||||
"fi;\0" \
|
||||
"console=" CONFIG_DEFAULT_CONSOLE \
|
||||
"console=console=ttySAC1,115200n8\0" \
|
||||
"mmcbootdev=0\0" \
|
||||
"mmcbootpart=1\0" \
|
||||
"mmcrootdev=0\0" \
|
||||
|
|
|
@ -14,8 +14,6 @@
|
|||
|
||||
#define CONFIG_SYS_SDRAM_BASE 0x40000000
|
||||
|
||||
/* select serial console configuration */
|
||||
|
||||
#define TZPC_BASE_OFFSET 0x10000
|
||||
|
||||
#define SDRAM_BANK_SIZE (256UL << 20UL) /* 256 MB */
|
||||
|
@ -25,8 +23,6 @@
|
|||
|
||||
#define CONFIG_SYS_INIT_SP_ADDR (CONFIG_SYS_LOAD_ADDR - 0x1000000)
|
||||
|
||||
#define CONFIG_DEFAULT_CONSOLE "console=ttySAC2,115200n8\0"
|
||||
|
||||
/* USB */
|
||||
#define CONFIG_USB_EHCI_EXYNOS
|
||||
|
||||
|
@ -97,7 +93,7 @@
|
|||
MEM_LAYOUT_ENV_SETTINGS \
|
||||
BOOTENV \
|
||||
"rootfstype=ext4\0" \
|
||||
"console=" CONFIG_DEFAULT_CONSOLE \
|
||||
"console=console=ttySAC2,115200n8\0" \
|
||||
"fdtfile=exynos5422-odroidxu3.dtb\0" \
|
||||
"board_name=odroidxu3\0" \
|
||||
"mmcbootdev=0\0" \
|
||||
|
|
|
@ -34,10 +34,6 @@
|
|||
/* Size of malloc() pool before and after relocation */
|
||||
#define CONFIG_SYS_MALLOC_LEN (CONFIG_ENV_SIZE + (80 << 20))
|
||||
|
||||
/*
|
||||
* select serial console configuration
|
||||
*/
|
||||
|
||||
/* MMC */
|
||||
#define SDHCI_MAX_HOSTS 4
|
||||
|
||||
|
@ -85,8 +81,6 @@
|
|||
|
||||
#define CONFIG_BOOTCOMMAND "run mmcboot"
|
||||
|
||||
#define CONFIG_DEFAULT_CONSOLE "console=ttySAC2,115200n8\0"
|
||||
|
||||
#define CONFIG_RAMDISK_BOOT "root=/dev/ram0 rw rootfstype=ext4" \
|
||||
" ${console} ${meminfo}"
|
||||
|
||||
|
@ -131,7 +125,7 @@
|
|||
"bootchart=set opts init=/sbin/bootchartd; run bootcmd\0" \
|
||||
"verify=n\0" \
|
||||
"rootfstype=ext4\0" \
|
||||
"console=" CONFIG_DEFAULT_CONSOLE \
|
||||
"console=console=ttySAC2,115200n8\0" \
|
||||
"meminfo=mem=80M mem=256M@0x40000000 mem=128M@0x50000000\0" \
|
||||
"loaduimage=ext4load mmc ${mmcdev}:${mmcbootpart} 0x30007FC0 uImage\0" \
|
||||
"mmcdev=0\0" \
|
||||
|
|
|
@ -22,12 +22,7 @@
|
|||
|
||||
#define SDRAM_BANK_SIZE (256 << 20) /* 256 MB */
|
||||
|
||||
/* select serial console configuration */
|
||||
|
||||
/* Console configuration */
|
||||
|
||||
#define CONFIG_BOOTCOMMAND "run mmcboot"
|
||||
#define CONFIG_DEFAULT_CONSOLE "console=ttySAC1,115200n8\0"
|
||||
|
||||
#define CONFIG_SYS_INIT_SP_ADDR (CONFIG_SYS_LOAD_ADDR \
|
||||
- GENERATED_GBL_DATA_SIZE)
|
||||
|
@ -102,7 +97,7 @@
|
|||
"mmcoops=mmc read 0 0x40000000 0x40 8; md 0x40000000 0x400\0" \
|
||||
"verify=n\0" \
|
||||
"rootfstype=ext4\0" \
|
||||
"console=" CONFIG_DEFAULT_CONSOLE \
|
||||
"console=console=ttySAC1,115200n8\0" \
|
||||
"mtdparts=" CONFIG_MTDPARTS_DEFAULT \
|
||||
"mbrparts=" MBRPARTS_DEFAULT \
|
||||
"meminfo=crashkernel=32M@0x50000000\0" \
|
||||
|
|
|
@ -29,12 +29,9 @@
|
|||
/* memtest works on */
|
||||
#define CONFIG_SYS_LOAD_ADDR (CONFIG_SYS_SDRAM_BASE + 0x4800000)
|
||||
|
||||
/* select serial console configuration */
|
||||
|
||||
#define CONFIG_MACH_TYPE MACH_TYPE_TRATS
|
||||
|
||||
#define CONFIG_BOOTCOMMAND "run autoboot"
|
||||
#define CONFIG_DEFAULT_CONSOLE "console=ttySAC2,115200n8\0"
|
||||
|
||||
#define CONFIG_SYS_INIT_SP_ADDR (CONFIG_SYS_LOAD_ADDR \
|
||||
- GENERATED_GBL_DATA_SIZE)
|
||||
|
@ -112,7 +109,7 @@
|
|||
"mmcoops=mmc read 0 0x40000000 0x40 8; md 0x40000000 0x400\0" \
|
||||
"verify=n\0" \
|
||||
"rootfstype=ext4\0" \
|
||||
"console=" CONFIG_DEFAULT_CONSOLE \
|
||||
"console=console=ttySAC2,115200n8\0" \
|
||||
"meminfo=crashkernel=32M@0x50000000\0" \
|
||||
"nfsroot=/nfsroot/arm\0" \
|
||||
"bootblock=" CONFIG_BOOTBLOCK "\0" \
|
||||
|
|
|
@ -27,12 +27,7 @@
|
|||
/* memtest works on */
|
||||
#define CONFIG_SYS_LOAD_ADDR (CONFIG_SYS_SDRAM_BASE + 0x3E00000)
|
||||
|
||||
/* select serial console configuration */
|
||||
|
||||
/* Console configuration */
|
||||
|
||||
#define CONFIG_BOOTCOMMAND "run autoboot"
|
||||
#define CONFIG_DEFAULT_CONSOLE "console=ttySAC2,115200n8\0"
|
||||
|
||||
#define CONFIG_SYS_INIT_SP_ADDR (CONFIG_SYS_LOAD_ADDR \
|
||||
- GENERATED_GBL_DATA_SIZE)
|
||||
|
@ -95,7 +90,7 @@
|
|||
"boottrace=setenv opts initcall_debug; run bootcmd\0" \
|
||||
"verify=n\0" \
|
||||
"rootfstype=ext4\0" \
|
||||
"console=" CONFIG_DEFAULT_CONSOLE \
|
||||
"console=console=ttySAC2,115200n8\0" \
|
||||
"kernelname=uImage\0" \
|
||||
"loaduimage=ext4load mmc ${mmcdev}:${mmcbootpart} 0x40007FC0 " \
|
||||
"${kernelname}\0" \
|
||||
|
|
Loading…
Reference in a new issue