From dd084b0a378c83e1f80785cc82049578849fb3d6 Mon Sep 17 00:00:00 2001 From: Ovidiu Panait Date: Fri, 24 Jul 2020 14:12:10 +0300 Subject: Kconfig: Convert CONFIG_SYS_SRAM_BASE to Kconfig This converts ad-hoc CONFIG_SYS_SRAM_BASE to Kconfig. Reviewed-by: Simon Glass Signed-off-by: Ovidiu Panait --- scripts/config_whitelist.txt | 1 - 1 file changed, 1 deletion(-) (limited to 'scripts') diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt index 6645d73cdca..1345cef1349 100644 --- a/scripts/config_whitelist.txt +++ b/scripts/config_whitelist.txt @@ -3715,7 +3715,6 @@ CONFIG_SYS_SPL_LEN CONFIG_SYS_SPL_MALLOC_SIZE CONFIG_SYS_SPL_MALLOC_START CONFIG_SYS_SPR -CONFIG_SYS_SRAM_BASE CONFIG_SYS_SRAM_SIZE CONFIG_SYS_SRAM_START CONFIG_SYS_SRIO -- cgit v1.3.1 From 9f63f02755f4cbdb8ee39d8da605d2f643aae220 Mon Sep 17 00:00:00 2001 From: Ovidiu Panait Date: Fri, 24 Jul 2020 14:12:11 +0300 Subject: Kconfig: Convert CONFIG_SYS_SRAM_SIZE to Kconfig This converts ad-hoc CONFIG_SYS_SRAM_SIZE to Kconfig. Reviewed-by: Simon Glass Signed-off-by: Ovidiu Panait --- Kconfig | 7 +++++++ include/configs/devkit8000.h | 1 - include/configs/pic32mzdask.h | 2 -- include/configs/tricorder.h | 1 - scripts/config_whitelist.txt | 1 - 5 files changed, 7 insertions(+), 5 deletions(-) (limited to 'scripts') diff --git a/Kconfig b/Kconfig index 9f7707a6529..583d39d1a3a 100644 --- a/Kconfig +++ b/Kconfig @@ -395,6 +395,13 @@ config SYS_SRAM_BASE default 0x80000000 if TARGET_PIC32MZDASK default 0x0 +config SYS_SRAM_SIZE + hex + default 0x00080000 if TARGET_PIC32MZDASK + default 0x10000 if TARGET_DEVKIT8000 + default 0x10000 if TARGET_TRICORDER + default 0x0 + endmenu # General setup menu "Boot images" diff --git a/include/configs/devkit8000.h b/include/configs/devkit8000.h index 5ef0fe7f924..4a287128334 100644 --- a/include/configs/devkit8000.h +++ b/include/configs/devkit8000.h @@ -139,7 +139,6 @@ /* SRAM config */ #define CONFIG_SYS_SRAM_START 0x40200000 -#define CONFIG_SYS_SRAM_SIZE 0x10000 /* Defines for SPL */ diff --git a/include/configs/pic32mzdask.h b/include/configs/pic32mzdask.h index 25b898f2e63..d50edc7715f 100644 --- a/include/configs/pic32mzdask.h +++ b/include/configs/pic32mzdask.h @@ -19,8 +19,6 @@ /*---------------------------------------------------------------------- * Memory Layout */ -#define CONFIG_SYS_SRAM_SIZE 0x00080000 /* 512K */ - /* Initial RAM for temporary stack, global data */ #define CONFIG_SYS_INIT_RAM_SIZE 0x10000 #define CONFIG_SYS_INIT_RAM_ADDR \ diff --git a/include/configs/tricorder.h b/include/configs/tricorder.h index 02f57281afd..b3ae350b776 100644 --- a/include/configs/tricorder.h +++ b/include/configs/tricorder.h @@ -199,7 +199,6 @@ /* SRAM config */ #define CONFIG_SYS_SRAM_START 0x40200000 -#define CONFIG_SYS_SRAM_SIZE 0x10000 /* Defines for SPL */ diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt index 1345cef1349..0d526cf0455 100644 --- a/scripts/config_whitelist.txt +++ b/scripts/config_whitelist.txt @@ -3715,7 +3715,6 @@ CONFIG_SYS_SPL_LEN CONFIG_SYS_SPL_MALLOC_SIZE CONFIG_SYS_SPL_MALLOC_START CONFIG_SYS_SPR -CONFIG_SYS_SRAM_SIZE CONFIG_SYS_SRAM_START CONFIG_SYS_SRIO CONFIG_SYS_SRIO1_MEM_BASE -- cgit v1.3.1 From 9a17bfb6420bb5de1781b37b5a423f41aab29000 Mon Sep 17 00:00:00 2001 From: Ovidiu Panait Date: Fri, 24 Jul 2020 14:12:12 +0300 Subject: Kconfig: Remove CONFIG_SYS_SRAM_START Remove ad-hoc CONFIG_SYS_SRAM_START and use CONFIG_SYS_SRAM_BASE instead. Reviewed-by: Simon Glass Signed-off-by: Ovidiu Panait --- Kconfig | 2 ++ include/configs/devkit8000.h | 3 --- include/configs/tricorder.h | 3 --- scripts/config_whitelist.txt | 1 - 4 files changed, 2 insertions(+), 7 deletions(-) (limited to 'scripts') diff --git a/Kconfig b/Kconfig index 583d39d1a3a..372425ed529 100644 --- a/Kconfig +++ b/Kconfig @@ -393,6 +393,8 @@ config SYS_HAS_SRAM config SYS_SRAM_BASE hex default 0x80000000 if TARGET_PIC32MZDASK + default 0x40200000 if TARGET_DEVKIT8000 + default 0x40200000 if TARGET_TRICORDER default 0x0 config SYS_SRAM_SIZE diff --git a/include/configs/devkit8000.h b/include/configs/devkit8000.h index 4a287128334..87da4410f5b 100644 --- a/include/configs/devkit8000.h +++ b/include/configs/devkit8000.h @@ -137,9 +137,6 @@ /* Boot Argument Buffer Size */ -/* SRAM config */ -#define CONFIG_SYS_SRAM_START 0x40200000 - /* Defines for SPL */ /* NAND boot config */ diff --git a/include/configs/tricorder.h b/include/configs/tricorder.h index b3ae350b776..55f25857eb3 100644 --- a/include/configs/tricorder.h +++ b/include/configs/tricorder.h @@ -197,9 +197,6 @@ CONFIG_SYS_INIT_RAM_SIZE - \ GENERATED_GBL_DATA_SIZE) -/* SRAM config */ -#define CONFIG_SYS_SRAM_START 0x40200000 - /* Defines for SPL */ #define CONFIG_SPL_FS_LOAD_PAYLOAD_NAME "u-boot.img" diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt index 0d526cf0455..82f8f12e20b 100644 --- a/scripts/config_whitelist.txt +++ b/scripts/config_whitelist.txt @@ -3715,7 +3715,6 @@ CONFIG_SYS_SPL_LEN CONFIG_SYS_SPL_MALLOC_SIZE CONFIG_SYS_SPL_MALLOC_START CONFIG_SYS_SPR -CONFIG_SYS_SRAM_START CONFIG_SYS_SRIO CONFIG_SYS_SRIO1_MEM_BASE CONFIG_SYS_SRIO1_MEM_BUS -- cgit v1.3.1