From 2c8d04dd1794baf777dea9ffdacf6a61033f2876 Mon Sep 17 00:00:00 2001 From: Tom Rini Date: Fri, 28 Oct 2022 20:27:02 -0400 Subject: Convert CONFIG_SYS_LOADS_BAUD_CHANGE et al to Kconfig This converts the following to Kconfig: CONFIG_SYS_LOADS_BAUD_CHANGE CONFIG_LOADS_ECHO As part of this, we move CMD_SAVES to be after CMD_LOADS as they are logically related (load or save an s-record format file) and this makes grouping of CONFIG_SYS_LOADS_BAUD_CHANGE easier. Signed-off-by: Tom Rini Reviewed-by: Simon Glass --- include/configs/MCR3000.h | 2 -- include/configs/MPC837XERDB.h | 7 ------- include/configs/MPC8548CDS.h | 7 ------- include/configs/P1010RDB.h | 3 --- include/configs/P2041RDB.h | 6 ------ include/configs/T102xRDB.h | 6 ------ include/configs/T104xRDB.h | 6 ------ include/configs/T208xQDS.h | 6 ------ include/configs/T4240RDB.h | 6 ------ include/configs/blanche.h | 2 -- include/configs/gazerbeam.h | 7 ------- include/configs/km/keymile-common.h | 3 --- include/configs/p1_p2_rdb_pc.h | 3 --- include/configs/qemu-ppce500.h | 6 ------ include/configs/socrates.h | 7 ------- 15 files changed, 77 deletions(-) (limited to 'include') diff --git a/include/configs/MCR3000.h b/include/configs/MCR3000.h index 1826a6fece8..1c467025ef6 100644 --- a/include/configs/MCR3000.h +++ b/include/configs/MCR3000.h @@ -56,8 +56,6 @@ #define CONFIG_SERVERIP 192.168.0.1 #define CONFIG_NETMASK 255.0.0.0 -#define CONFIG_LOADS_ECHO 1 /* echo on for serial download */ - /* Miscellaneous configurable options */ /* Definitions for initial stack pointer and data area (in DPRAM) */ diff --git a/include/configs/MPC837XERDB.h b/include/configs/MPC837XERDB.h index c6f99925af7..d42dfb0df4a 100644 --- a/include/configs/MPC837XERDB.h +++ b/include/configs/MPC837XERDB.h @@ -216,13 +216,6 @@ #endif #endif -/* - * Environment - */ - -#define CONFIG_LOADS_ECHO 1 /* echo on for serial download */ -#define CONFIG_SYS_LOADS_BAUD_CHANGE 1 /* allow baudrate change */ - #ifdef CONFIG_MMC #define CONFIG_FSL_ESDHC_PIN_MUX #define CONFIG_SYS_FSL_ESDHC_ADDR CONFIG_SYS_MPC83xx_ESDHC_ADDR diff --git a/include/configs/MPC8548CDS.h b/include/configs/MPC8548CDS.h index 762fa0b3959..6aa209461a3 100644 --- a/include/configs/MPC8548CDS.h +++ b/include/configs/MPC8548CDS.h @@ -329,13 +329,6 @@ #define TSEC4_FLAGS (TSEC_GIGABIT | TSEC_REDUCED) #endif /* CONFIG_TSEC_ENET */ -/* - * Environment - */ - -#define CONFIG_LOADS_ECHO 1 /* echo on for serial download */ -#define CONFIG_SYS_LOADS_BAUD_CHANGE 1 /* allow baudrate change */ - /* * Miscellaneous configurable options */ diff --git a/include/configs/P1010RDB.h b/include/configs/P1010RDB.h index 06188cac44f..b87118c1ed2 100644 --- a/include/configs/P1010RDB.h +++ b/include/configs/P1010RDB.h @@ -407,9 +407,6 @@ extern unsigned long get_sdram_size(void); #endif #endif -#define CONFIG_LOADS_ECHO /* echo on for serial download */ -#define CONFIG_SYS_LOADS_BAUD_CHANGE /* allow baudrate change */ - #if defined(CONFIG_MMC) || defined(CONFIG_USB_EHCI_HCD) \ || defined(CONFIG_FSL_SATA) #endif diff --git a/include/configs/P2041RDB.h b/include/configs/P2041RDB.h index 874910f24e3..60b0963648c 100644 --- a/include/configs/P2041RDB.h +++ b/include/configs/P2041RDB.h @@ -310,12 +310,6 @@ #define CONFIG_SYS_TBIPA_VALUE 8 #endif -/* - * Environment - */ -#define CONFIG_LOADS_ECHO /* echo on for serial download */ -#define CONFIG_SYS_LOADS_BAUD_CHANGE /* allow baudrate change */ - #ifdef CONFIG_MMC #define CONFIG_SYS_FSL_ESDHC_ADDR CONFIG_SYS_MPC85xx_ESDHC_ADDR #endif diff --git a/include/configs/T102xRDB.h b/include/configs/T102xRDB.h index 72b98c5f27f..f6a911cc177 100644 --- a/include/configs/T102xRDB.h +++ b/include/configs/T102xRDB.h @@ -426,12 +426,6 @@ * Dynamic MTD Partition support with mtdparts */ -/* - * Environment - */ -#define CONFIG_LOADS_ECHO /* echo on for serial download */ -#define CONFIG_SYS_LOADS_BAUD_CHANGE /* allow baudrate change */ - /* * Miscellaneous configurable options */ diff --git a/include/configs/T104xRDB.h b/include/configs/T104xRDB.h index f8c905404d5..d9ee8736adc 100644 --- a/include/configs/T104xRDB.h +++ b/include/configs/T104xRDB.h @@ -415,12 +415,6 @@ #endif #endif -/* - * Environment - */ -#define CONFIG_LOADS_ECHO /* echo on for serial download */ -#define CONFIG_SYS_LOADS_BAUD_CHANGE /* allow baudrate change */ - /* * Miscellaneous configurable options */ diff --git a/include/configs/T208xQDS.h b/include/configs/T208xQDS.h index 8d3b49655ac..6701eab1155 100644 --- a/include/configs/T208xQDS.h +++ b/include/configs/T208xQDS.h @@ -431,12 +431,6 @@ * Dynamic MTD Partition support with mtdparts */ -/* - * Environment - */ -#define CONFIG_LOADS_ECHO /* echo on for serial download */ -#define CONFIG_SYS_LOADS_BAUD_CHANGE /* allow baudrate change */ - /* * Miscellaneous configurable options */ diff --git a/include/configs/T4240RDB.h b/include/configs/T4240RDB.h index 05c4406b770..1ad82238b27 100644 --- a/include/configs/T4240RDB.h +++ b/include/configs/T4240RDB.h @@ -133,12 +133,6 @@ #define CONFIG_SYS_PCIE4_MEM_PHYS 0xc60000000ull #define CONFIG_SYS_PCIE4_IO_PHYS 0xff8030000ull -/* - * Environment - */ -#define CONFIG_LOADS_ECHO /* echo on for serial download */ -#define CONFIG_SYS_LOADS_BAUD_CHANGE /* allow baudrate change */ - /* * Miscellaneous configurable options */ diff --git a/include/configs/blanche.h b/include/configs/blanche.h index 959c521b6c9..0b1fc91d9e1 100644 --- a/include/configs/blanche.h +++ b/include/configs/blanche.h @@ -21,8 +21,6 @@ #define RCAR_GEN2_SDRAM_SIZE (1024u * 1024 * 1024) #define RCAR_GEN2_UBOOT_SDRAM_SIZE (512 * 1024 * 1024) -#undef CONFIG_SYS_LOADS_BAUD_CHANGE - /* FLASH */ #if !defined(CONFIG_MTD_NOR_FLASH) #define CONFIG_SH_QSPI_BASE 0xE6B10000 diff --git a/include/configs/gazerbeam.h b/include/configs/gazerbeam.h index 771a30106c1..8bab723e569 100644 --- a/include/configs/gazerbeam.h +++ b/include/configs/gazerbeam.h @@ -42,13 +42,6 @@ #define CONFIG_SYS_BAUDRATE_TABLE \ {300, 600, 1200, 2400, 4800, 9600, 19200, 38400, 57600, 115200} -/* - * Environment - */ - -#define CONFIG_LOADS_ECHO /* echo on for serial download */ -#define CONFIG_SYS_LOADS_BAUD_CHANGE /* allow baudrate change */ - /* * Miscellaneous configurable options */ diff --git a/include/configs/km/keymile-common.h b/include/configs/km/keymile-common.h index 1bfc89bf44c..35cf27a2eb9 100644 --- a/include/configs/km/keymile-common.h +++ b/include/configs/km/keymile-common.h @@ -15,9 +15,6 @@ #define CONFIG_SYS_BAUDRATE_TABLE { 9600, 19200, 38400, 57600, 115200, 230400 } -#define CONFIG_LOADS_ECHO -#define CONFIG_SYS_LOADS_BAUD_CHANGE - #ifndef CONFIG_KM_DEF_ENV_BOOTPARAMS #define CONFIG_KM_DEF_ENV_BOOTPARAMS \ "actual_bank=0\0" diff --git a/include/configs/p1_p2_rdb_pc.h b/include/configs/p1_p2_rdb_pc.h index 73bda9dc70e..fcb287d6410 100644 --- a/include/configs/p1_p2_rdb_pc.h +++ b/include/configs/p1_p2_rdb_pc.h @@ -415,9 +415,6 @@ #endif #endif -#define CONFIG_LOADS_ECHO /* echo on for serial download */ -#define CONFIG_SYS_LOADS_BAUD_CHANGE /* allow baudrate change */ - /* * USB */ diff --git a/include/configs/qemu-ppce500.h b/include/configs/qemu-ppce500.h index 5181792b7b7..621135fe101 100644 --- a/include/configs/qemu-ppce500.h +++ b/include/configs/qemu-ppce500.h @@ -51,12 +51,6 @@ extern unsigned long long get_phys_ccsrbar_addr_early(void); /* RTC */ #define CONFIG_RTC_PT7C4338 -/* - * Environment - */ - -#define CONFIG_LOADS_ECHO /* echo on for serial download */ - /* * Miscellaneous configurable options */ diff --git a/include/configs/socrates.h b/include/configs/socrates.h index c75991badab..00e8136cc9c 100644 --- a/include/configs/socrates.h +++ b/include/configs/socrates.h @@ -135,13 +135,6 @@ /* Options are: TSEC[0,1] */ -/* - * Environment - */ - -#define CONFIG_LOADS_ECHO 1 /* echo on for serial download */ -#define CONFIG_SYS_LOADS_BAUD_CHANGE 1 /* allow baudrate change */ - /* * Miscellaneous configurable options */ -- cgit v1.2.3