[PATCH 1/4] treewide: configs: get rid of unused CONFIG_DEFAULT_CONSOLE
These are all unused.
Signed-off-by: Andre Heider a.heider@gmail.com --- This sets completely removes CONFIG_DEFAULT_CONSOLE from the tree. Only compile time tested.
include/configs/arndale.h | 2 -- include/configs/espresso7420.h | 3 --- include/configs/origen.h | 5 ----- include/configs/peach-pi.h | 3 --- include/configs/peach-pit.h | 3 --- include/configs/smdk5250.h | 2 -- include/configs/smdk5420.h | 5 ----- include/configs/smdkv310.h | 2 -- include/configs/snow.h | 2 -- include/configs/spring.h | 2 -- 10 files changed, 29 deletions(-)
diff --git a/include/configs/arndale.h b/include/configs/arndale.h index 79e7418b9b..5109f7de53 100644 --- a/include/configs/arndale.h +++ b/include/configs/arndale.h @@ -18,8 +18,6 @@ #define CONFIG_EXYNOS_SPL
/* Miscellaneous configurable options */ -#define CONFIG_DEFAULT_CONSOLE "console=ttySAC2,115200n8\0" - #define CONFIG_IRAM_STACK 0x02050000
#define CONFIG_SYS_INIT_SP_ADDR CONFIG_IRAM_STACK diff --git a/include/configs/espresso7420.h b/include/configs/espresso7420.h index 5aeb009f03..2495db93f8 100644 --- a/include/configs/espresso7420.h +++ b/include/configs/espresso7420.h @@ -18,9 +18,6 @@ #define CONFIG_SPL_STACK CONFIG_IRAM_END #define CONFIG_SYS_INIT_SP_ADDR CONFIG_IRAM_END
-/* select serial console configuration */ -#define CONFIG_DEFAULT_CONSOLE "console=ttySAC1,115200n8\0" - /* DRAM Memory Banks */ #define SDRAM_BANK_SIZE (256UL << 20UL) /* 256 MB */
diff --git a/include/configs/origen.h b/include/configs/origen.h index 24b0338deb..8a0e145c76 100644 --- a/include/configs/origen.h +++ b/include/configs/origen.h @@ -24,11 +24,6 @@
#define CONFIG_MACH_TYPE MACH_TYPE_ORIGEN
-/* select serial console configuration */ - -/* Console configuration */ -#define CONFIG_DEFAULT_CONSOLE "console=ttySAC1,115200n8\0" - #define CONFIG_SYS_MEM_TOP_HIDE (1 << 20) /* ram console */
#define CONFIG_SYS_MONITOR_BASE 0x00000000 diff --git a/include/configs/peach-pi.h b/include/configs/peach-pi.h index a732e06a99..ba82aaf653 100644 --- a/include/configs/peach-pi.h +++ b/include/configs/peach-pi.h @@ -23,9 +23,6 @@ #define CONFIG_SYS_SDRAM_BASE 0x20000000 #define CONFIG_SYS_INIT_SP_ADDR (CONFIG_IRAM_TOP - 0x800)
-/* select serial console configuration */ -#define CONFIG_DEFAULT_CONSOLE "console=ttySAC1,115200n8\0" - /* Display */ #ifdef CONFIG_LCD #define CONFIG_EXYNOS_FB diff --git a/include/configs/peach-pit.h b/include/configs/peach-pit.h index 6c5960cb8d..16fb2f3a0e 100644 --- a/include/configs/peach-pit.h +++ b/include/configs/peach-pit.h @@ -23,9 +23,6 @@ #define CONFIG_SYS_SDRAM_BASE 0x20000000 #define CONFIG_SYS_INIT_SP_ADDR (CONFIG_IRAM_TOP - 0x800)
-/* select serial console configuration */ -#define CONFIG_DEFAULT_CONSOLE "console=ttySAC1,115200n8\0" - /* DRAM Memory Banks */ #define SDRAM_BANK_SIZE (512UL << 20UL) /* 512 MB */
diff --git a/include/configs/smdk5250.h b/include/configs/smdk5250.h index 82251b3615..3af13673f2 100644 --- a/include/configs/smdk5250.h +++ b/include/configs/smdk5250.h @@ -18,6 +18,4 @@
#define CONFIG_BOARD_COMMON
-#define CONFIG_DEFAULT_CONSOLE "console=ttySAC1,115200n8\0" - #endif /* __CONFIG_SMDK_H */ diff --git a/include/configs/smdk5420.h b/include/configs/smdk5420.h index 14ec099d53..d06dfe43a2 100644 --- a/include/configs/smdk5420.h +++ b/include/configs/smdk5420.h @@ -24,11 +24,6 @@ #define CONFIG_SYS_SDRAM_BASE 0x20000000 #define CONFIG_SYS_INIT_SP_ADDR (CONFIG_IRAM_TOP - 0x800)
-/* select serial console configuration */ -#define CONFIG_DEFAULT_CONSOLE "console=ttySAC1,115200n8\0" - -#define CONFIG_DEFAULT_CONSOLE "console=ttySAC1,115200n8\0" - /* USB */ #define CONFIG_USB_XHCI_EXYNOS
diff --git a/include/configs/smdkv310.h b/include/configs/smdkv310.h index b970e4bc80..ede057322f 100644 --- a/include/configs/smdkv310.h +++ b/include/configs/smdkv310.h @@ -36,8 +36,6 @@
#define CONFIG_BOOTCOMMAND "fatload mmc 0 40007000 uImage; bootm 40007000"
-/* Miscellaneous configurable options */ -#define CONFIG_DEFAULT_CONSOLE "console=ttySAC2,115200n8\0" /* memtest works on */ #define CONFIG_SYS_LOAD_ADDR (CONFIG_SYS_SDRAM_BASE + 0x3E00000)
diff --git a/include/configs/snow.h b/include/configs/snow.h index c546a5a6d0..c082b2d82d 100644 --- a/include/configs/snow.h +++ b/include/configs/snow.h @@ -17,6 +17,4 @@
#define CONFIG_BOARD_COMMON
-#define CONFIG_DEFAULT_CONSOLE "console=ttySAC1,115200n8\0" - #endif /* __CONFIG_SNOW_H */ diff --git a/include/configs/spring.h b/include/configs/spring.h index 272622a5ed..0b052453a5 100644 --- a/include/configs/spring.h +++ b/include/configs/spring.h @@ -12,6 +12,4 @@
#define CONFIG_BOARD_COMMON
-#define CONFIG_DEFAULT_CONSOLE "console=ttySAC1,115200n8\0" - #endif /* __CONFIG_SPRING_H */
In prepartion to remove CONFIG_DEFAULT_CONSOLE, fold the current users.
Signed-off-by: Andre Heider a.heider@gmail.com --- include/configs/odroid.h | 7 +------ include/configs/odroid_xu3.h | 6 +----- include/configs/s5p_goni.h | 8 +------- include/configs/s5pc210_universal.h | 7 +------ include/configs/trats.h | 5 +---- include/configs/trats2.h | 7 +------ 6 files changed, 6 insertions(+), 34 deletions(-)
diff --git a/include/configs/odroid.h b/include/configs/odroid.h index befb9f9aa1..1367d13891 100644 --- a/include/configs/odroid.h +++ b/include/configs/odroid.h @@ -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" \ diff --git a/include/configs/odroid_xu3.h b/include/configs/odroid_xu3.h index 564319c231..0c86196152 100644 --- a/include/configs/odroid_xu3.h +++ b/include/configs/odroid_xu3.h @@ -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" \ diff --git a/include/configs/s5p_goni.h b/include/configs/s5p_goni.h index d6d07a95b6..9688bdc4c0 100644 --- a/include/configs/s5p_goni.h +++ b/include/configs/s5p_goni.h @@ -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" \ diff --git a/include/configs/s5pc210_universal.h b/include/configs/s5pc210_universal.h index da6ed975c3..e60c7c7edd 100644 --- a/include/configs/s5pc210_universal.h +++ b/include/configs/s5pc210_universal.h @@ -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" \ diff --git a/include/configs/trats.h b/include/configs/trats.h index 3202627a7d..3d85792f0c 100644 --- a/include/configs/trats.h +++ b/include/configs/trats.h @@ -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" \ diff --git a/include/configs/trats2.h b/include/configs/trats2.h index 14549dd1a0..3f7f5ce760 100644 --- a/include/configs/trats2.h +++ b/include/configs/trats2.h @@ -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" \
On Thu, Sep 17, 2020 at 08:52:01AM +0200, Andre Heider wrote:
In prepartion to remove CONFIG_DEFAULT_CONSOLE, fold the current users.
Signed-off-by: Andre Heider a.heider@gmail.com
include/configs/odroid.h | 7 +------ include/configs/odroid_xu3.h | 6 +----- include/configs/s5p_goni.h | 8 +------- include/configs/s5pc210_universal.h | 7 +------ include/configs/trats.h | 5 +---- include/configs/trats2.h | 7 +------ 6 files changed, 6 insertions(+), 34 deletions(-)
Acked-by: Krzysztof Kozlowski krzk@kernel.org
Best regards, Krzysztof
On Thu, 17 Sep 2020 at 00:52, Andre Heider a.heider@gmail.com wrote:
In prepartion to remove CONFIG_DEFAULT_CONSOLE, fold the current users.
Signed-off-by: Andre Heider a.heider@gmail.com
include/configs/odroid.h | 7 +------ include/configs/odroid_xu3.h | 6 +----- include/configs/s5p_goni.h | 8 +------- include/configs/s5pc210_universal.h | 7 +------ include/configs/trats.h | 5 +---- include/configs/trats2.h | 7 +------ 6 files changed, 6 insertions(+), 34 deletions(-)
Reviewed-by: Simon Glass sjg@chromium.org
There're no users left.
Signed-off-by: Andre Heider a.heider@gmail.com --- scripts/config_whitelist.txt | 1 - 1 file changed, 1 deletion(-)
diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt index 093e432efc..470506da5b 100644 --- a/scripts/config_whitelist.txt +++ b/scripts/config_whitelist.txt @@ -290,7 +290,6 @@ CONFIG_DEBUG_UART_LINFLEXUART CONFIG_DEBUG_WRITECOUNT CONFIG_DEEP_SLEEP CONFIG_DEFAULT -CONFIG_DEFAULT_CONSOLE CONFIG_DEFAULT_IMMR CONFIG_DESIGNWARE_ETH CONFIG_DEVELOP
On Thu, 17 Sep 2020 at 00:52, Andre Heider a.heider@gmail.com wrote:
There're no users left.
Signed-off-by: Andre Heider a.heider@gmail.com
scripts/config_whitelist.txt | 1 - 1 file changed, 1 deletion(-)
Reviewed-by: Simon Glass sjg@chromium.org
Unused.
Signed-off-by: Andre Heider a.heider@gmail.com --- include/configs/smdkv310.h | 3 --- 1 file changed, 3 deletions(-)
diff --git a/include/configs/smdkv310.h b/include/configs/smdkv310.h index ede057322f..fc2f6ecf6b 100644 --- a/include/configs/smdkv310.h +++ b/include/configs/smdkv310.h @@ -27,9 +27,6 @@ #define S5P_CHECK_DIDLE 0xBAD00000 #define S5P_CHECK_LPA 0xABAD0000
-/* select serial console configuration */ -#define EXYNOS4_DEFAULT_UART_OFFSET 0x010000 - /* MMC SPL */ #define CONFIG_SKIP_LOWLEVEL_INIT #define COPY_BL2_FNPTR_ADDR 0x00002488
On Thu, Sep 17, 2020 at 08:52:03AM +0200, Andre Heider wrote:
Unused.
Signed-off-by: Andre Heider a.heider@gmail.com
include/configs/smdkv310.h | 3 --- 1 file changed, 3 deletions(-)
Acked-by: Krzysztof Kozlowski krzk@kernel.org
Best regards, Krzysztof
On Thu, 17 Sep 2020 at 00:52, Andre Heider a.heider@gmail.com wrote:
Unused.
Signed-off-by: Andre Heider a.heider@gmail.com
include/configs/smdkv310.h | 3 --- 1 file changed, 3 deletions(-)
Reviewed-by: Simon Glass sjg@chromium.org
On Thu, Sep 17, 2020 at 08:52:00AM +0200, Andre Heider wrote:
These are all unused.
Signed-off-by: Andre Heider a.heider@gmail.com
This sets completely removes CONFIG_DEFAULT_CONSOLE from the tree. Only compile time tested.
include/configs/arndale.h | 2 -- include/configs/espresso7420.h | 3 --- include/configs/origen.h | 5 ----- include/configs/peach-pi.h | 3 --- include/configs/peach-pit.h | 3 --- include/configs/smdk5250.h | 2 -- include/configs/smdk5420.h | 5 ----- include/configs/smdkv310.h | 2 -- include/configs/snow.h | 2 -- include/configs/spring.h | 2 -- 10 files changed, 29 deletions(-)
Acked-by: Krzysztof Kozlowski krzk@kernel.org
Best regards, Krzysztof
On Thu, 17 Sep 2020 at 00:52, Andre Heider a.heider@gmail.com wrote:
These are all unused.
Signed-off-by: Andre Heider a.heider@gmail.com
This sets completely removes CONFIG_DEFAULT_CONSOLE from the tree. Only compile time tested.
include/configs/arndale.h | 2 -- include/configs/espresso7420.h | 3 --- include/configs/origen.h | 5 ----- include/configs/peach-pi.h | 3 --- include/configs/peach-pit.h | 3 --- include/configs/smdk5250.h | 2 -- include/configs/smdk5420.h | 5 ----- include/configs/smdkv310.h | 2 -- include/configs/snow.h | 2 -- include/configs/spring.h | 2 -- 10 files changed, 29 deletions(-)
Reviewed-by: Simon Glass sjg@chromium.org
Dear Andre Heider,
On Wed, 23 Sep 2020 at 03:59, Simon Glass sjg@chromium.org wrote:
On Thu, 17 Sep 2020 at 00:52, Andre Heider a.heider@gmail.com wrote:
These are all unused.
Signed-off-by: Andre Heider a.heider@gmail.com
This sets completely removes CONFIG_DEFAULT_CONSOLE from the tree. Only compile time tested.
include/configs/arndale.h | 2 -- include/configs/espresso7420.h | 3 --- include/configs/origen.h | 5 ----- include/configs/peach-pi.h | 3 --- include/configs/peach-pit.h | 3 --- include/configs/smdk5250.h | 2 -- include/configs/smdk5420.h | 5 ----- include/configs/smdkv310.h | 2 -- include/configs/snow.h | 2 -- include/configs/spring.h | 2 -- 10 files changed, 29 deletions(-)
Reviewed-by: Simon Glass sjg@chromium.org
Applied to u-boot-samsung.
participants (4)
-
Andre Heider -
Krzysztof Kozlowski -
Minkyu Kang -
Simon Glass