Convert CONFIG_SYS_MEM_TOP_HIDE to Kconfig

This converts the following to Kconfig:
   CONFIG_SYS_MEM_TOP_HIDE

Signed-off-by: Tom Rini <trini@konsulko.com>

diff --git a/Kconfig b/Kconfig
index b45e60a75b93514ad37bed6c3efb4716755e18bb..e269856f7ef5a6b4eefbcb4d7f8f108240d6d54c 100644 (file)
--- a/Kconfig
+++ b/Kconfig
@@ -489,6 +489,17 @@ config STACK_SIZE
          by the UEFI sub-system. On some boards initrd_high is calculated as
          base stack pointer minus this stack size.
 
+config SYS_MEM_TOP_HIDE
+       hex "Exclude some memory from U-Boot / OS information"
+       default 0x0
+       help
+         If set, this specified memory area will get subtracted from the top
+         (end) of RAM and won't get "touched" at all by U-Boot. By fixing up
+         gd->ram_size the OS / next stage should gets passed the now
+         "corrected" memory size and won't touch it either.
+         WARNING: Please make sure that this value is a multiple of the OS
+         page size.
+
 config SYS_HAS_SRAM
        bool
        default y if TARGET_PIC32MZDASK

diff --git a/README b/README
index d503357f3be21a4e36ce42ea91c384ec5f4cc681..1967961eea02b3b21f1441bb31fbae750bb5160f 100644 (file)
--- a/README
+++ b/README
@@ -1876,27 +1876,6 @@ Configuration Settings:
                the RAM base is not zero, or RAM is divided into banks,
                this variable needs to be recalcuated to get the address.
 
-- CONFIG_SYS_MEM_TOP_HIDE:
-               If CONFIG_SYS_MEM_TOP_HIDE is defined in the board config header,
-               this specified memory area will get subtracted from the top
-               (end) of RAM and won't get "touched" at all by U-Boot. By
-               fixing up gd->ram_size the Linux kernel should gets passed
-               the now "corrected" memory size and won't touch it either.
-               This should work for arch/ppc and arch/powerpc. Only Linux
-               board ports in arch/powerpc with bootwrapper support that
-               recalculate the memory size from the SDRAM controller setup
-               will have to get fixed in Linux additionally.
-
-               This option can be used as a workaround for the 440EPx/GRx
-               CHIP 11 errata where the last 256 bytes in SDRAM shouldn't
-               be touched.
-
-               WARNING: Please make sure that this value is a multiple of
-               the Linux page size (normally 4k). If this is not the case,
-               then the end address of the Linux memory will be located at a
-               non page size aligned address and this could cause major
-               problems.
-
 - CONFIG_SYS_LOADS_BAUD_CHANGE:
                Enable temporary baudrate change while serial download
 

diff --git a/board/samsung/common/board.c b/board/samsung/common/board.c
index 97791aaeffe2e1047381adc02d9c2a6f76bcd786..ff178b7fe677c55cad3715912a830362be5e9eac 100644 (file)
--- a/board/samsung/common/board.c
+++ b/board/samsung/common/board.c
@@ -107,9 +107,9 @@ int board_init(void)
        }
        boot_temp_check();
 #endif
-#ifdef CONFIG_TZSW_RESERVED_DRAM_SIZE
+#if CONFIG_VAL(SYS_MEM_TOP_HIDE)
        /* The last few MB of memory can be reserved for secure firmware */
-       ulong size = CONFIG_TZSW_RESERVED_DRAM_SIZE;
+       ulong size = CONFIG_SYS_MEM_TOP_HIDE;
 
        gd->ram_size -= size;
        gd->bd->bi_dram[CONFIG_NR_DRAM_BANKS - 1].size -= size;

diff --git a/common/board_f.c b/common/board_f.c
index 5b655ad6efe4ce36a895c17918e9aa5f51915795..4d7e40013e1c87d130fb931a9219dbdcb00a765f 100644 (file)
--- a/common/board_f.c
+++ b/common/board_f.c
@@ -327,7 +327,7 @@ static int setup_dest_addr(void)
         * Ram is setup, size stored in gd !!
         */
        debug("Ram size: %08lX\n", (ulong)gd->ram_size);
-#if defined(CONFIG_SYS_MEM_TOP_HIDE)
+#if CONFIG_VAL(SYS_MEM_TOP_HIDE)
        /*
         * Subtract specified amount of memory to hide so that it won't
         * get "touched" at all by U-Boot. By fixing up gd->ram_size

diff --git a/configs/odroid-xu3_defconfig b/configs/odroid-xu3_defconfig
index d7f9c208bb0c58816c9b9d68ffde72919d53725c..250c0b4b3da32e870b8eda05291917818d69b80e 100644 (file)
--- a/configs/odroid-xu3_defconfig
+++ b/configs/odroid-xu3_defconfig
@@ -13,6 +13,7 @@ CONFIG_IDENT_STRING=" for ODROID-XU3/XU4/HC1/HC2"
 CONFIG_SYS_LOAD_ADDR=0x43e00000
 CONFIG_DISTRO_DEFAULTS=y
 # CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
+CONFIG_SYS_MEM_TOP_HIDE=0x01600000
 CONFIG_FIT=y
 CONFIG_FIT_BEST_MATCH=y
 CONFIG_SILENT_CONSOLE=y

diff --git a/configs/odroid_defconfig b/configs/odroid_defconfig
index 9f5688e039dee4cb2ba2fe3d56084f830b25701b..058e7dc3177c1dd590d65a6877950561758d3706 100644 (file)
--- a/configs/odroid_defconfig
+++ b/configs/odroid_defconfig
@@ -14,6 +14,7 @@ CONFIG_DEFAULT_DEVICE_TREE="exynos4412-odroid"
 CONFIG_SYS_LOAD_ADDR=0x43e00000
 CONFIG_DISTRO_DEFAULTS=y
 # CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
+CONFIG_SYS_MEM_TOP_HIDE=0x00100000
 CONFIG_FIT=y
 CONFIG_FIT_VERBOSE=y
 CONFIG_USE_BOOTARGS=y

diff --git a/configs/origen_defconfig b/configs/origen_defconfig
index 6ffec862cd9d0e5daf00657e8cbfa86809bab9aa..b4b0d8b1464c62cf6105f45c4846737df254bcb2 100644 (file)
--- a/configs/origen_defconfig
+++ b/configs/origen_defconfig
@@ -16,6 +16,7 @@ CONFIG_SPL=y
 CONFIG_IDENT_STRING=" for ORIGEN"
 CONFIG_SYS_LOAD_ADDR=0x43e00000
 CONFIG_DISTRO_DEFAULTS=y
+CONFIG_SYS_MEM_TOP_HIDE=0x100000
 CONFIG_BOOTCOMMAND="if mmc rescan; then echo SD/MMC found on device ${mmcdev};if run loadbootenv; then echo Loaded environment from ${bootenv};run importbootenv;fi;if test -n $uenvcmd; then echo Running uenvcmd ...;run uenvcmd;fi;if run loadbootscript; then run bootscript; fi; fi;load mmc ${mmcdev} ${loadaddr} uImage; bootm ${loadaddr} "
 CONFIG_SYS_CONSOLE_IS_IN_ENV=y
 CONFIG_SYS_CONSOLE_INFO_QUIET=y

diff --git a/configs/s5pc210_universal_defconfig b/configs/s5pc210_universal_defconfig
index 8a34908e85cc12e70992928e05ae2e49cd118f2a..e70ce25b099dc4e647a88f964ae47a6d3e129b2a 100644 (file)
--- a/configs/s5pc210_universal_defconfig
+++ b/configs/s5pc210_universal_defconfig
@@ -13,6 +13,7 @@ CONFIG_ENV_OFFSET=0x7000
 CONFIG_DEFAULT_DEVICE_TREE="exynos4210-universal_c210"
 CONFIG_SYS_LOAD_ADDR=0x44800000
 CONFIG_DISTRO_DEFAULTS=y
+CONFIG_SYS_MEM_TOP_HIDE=0x100000
 CONFIG_USE_BOOTARGS=y
 CONFIG_BOOTARGS="Please use defined boot"
 CONFIG_BOOTCOMMAND="run mmcboot"

diff --git a/configs/theadorable_debug_defconfig b/configs/theadorable_debug_defconfig
index 64ae29113e3e21cd35c31736905e7727fb2aded9..230c086617a5174c8078721f37eb34d714f2a835 100644 (file)
--- a/configs/theadorable_debug_defconfig
+++ b/configs/theadorable_debug_defconfig
@@ -20,6 +20,7 @@ CONFIG_DEBUG_UART_CLOCK=250000000
 CONFIG_SYS_LOAD_ADDR=0x800000
 CONFIG_DEBUG_UART=y
 # CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
+CONFIG_SYS_MEM_TOP_HIDE=0x80000
 CONFIG_FIT=y
 CONFIG_BOOTDELAY=3
 CONFIG_USE_PREBOOT=y

diff --git a/configs/trats2_defconfig b/configs/trats2_defconfig
index b38ee99371b945e795ead87adec4dc61ff3e5760..690cdef4c4ab07184d4696b5d91278bdfe69cf19 100644 (file)
--- a/configs/trats2_defconfig
+++ b/configs/trats2_defconfig
@@ -13,6 +13,7 @@ CONFIG_DEFAULT_DEVICE_TREE="exynos4412-trats2"
 CONFIG_SYS_LOAD_ADDR=0x43e00000
 CONFIG_DISTRO_DEFAULTS=y
 # CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
+CONFIG_SYS_MEM_TOP_HIDE=0x100000
 CONFIG_FIT=y
 CONFIG_FIT_VERBOSE=y
 CONFIG_USE_BOOTARGS=y

diff --git a/configs/trats_defconfig b/configs/trats_defconfig
index d0689444f987b7e414db248b2f99a5d022dd8146..18890799535ec8dcde503586fc740a3ce533bc89 100644 (file)
--- a/configs/trats_defconfig
+++ b/configs/trats_defconfig
@@ -12,6 +12,7 @@ CONFIG_ENV_OFFSET=0x7000
 CONFIG_DEFAULT_DEVICE_TREE="exynos4210-trats"
 CONFIG_SYS_LOAD_ADDR=0x44800000
 CONFIG_DISTRO_DEFAULTS=y
+CONFIG_SYS_MEM_TOP_HIDE=0x100000
 CONFIG_FIT=y
 CONFIG_FIT_VERBOSE=y
 CONFIG_USE_BOOTARGS=y

diff --git a/include/configs/odroid.h b/include/configs/odroid.h
index 42031bb993441836db36989a83abb645a8a30673..b8b47af4712bf453f3dec9e0452bd3dfe351bc09 100644 (file)
--- a/include/configs/odroid.h
+++ b/include/configs/odroid.h
@@ -21,9 +21,6 @@
 #define CONFIG_SYS_SDRAM_BASE  0x40000000
 #define SDRAM_BANK_SIZE                (256 << 20)     /* 256 MB */
 #define PHYS_SDRAM_1           CONFIG_SYS_SDRAM_BASE
-/* Reserve the last 1 MiB for the secure firmware */
-#define CONFIG_SYS_MEM_TOP_HIDE                (1UL << 20UL)
-#define CONFIG_TZSW_RESERVED_DRAM_SIZE CONFIG_SYS_MEM_TOP_HIDE
 
 #include <linux/sizes.h>
 

diff --git a/include/configs/odroid_xu3.h b/include/configs/odroid_xu3.h
index 616f25eafd3ece39483bf0d89fa4d1640989ee92..eb35d7b4ae2d6563a54d05e4f233a7a04d272b18 100644 (file)
--- a/include/configs/odroid_xu3.h
+++ b/include/configs/odroid_xu3.h
@@ -15,9 +15,6 @@
 #define TZPC_BASE_OFFSET               0x10000
 
 #define SDRAM_BANK_SIZE                        (256UL << 20UL) /* 256 MB */
-/* Reserve the last 22 MiB for the secure firmware */
-#define CONFIG_SYS_MEM_TOP_HIDE                (22UL << 20UL)
-#define CONFIG_TZSW_RESERVED_DRAM_SIZE CONFIG_SYS_MEM_TOP_HIDE
 
 #define CONFIG_SYS_INIT_SP_ADDR                (CONFIG_SYS_LOAD_ADDR - 0x1000000)
 

diff --git a/include/configs/origen.h b/include/configs/origen.h
index 278c204ded8ac8b433b2debec7c531dceb21a994..c4f5997c3dec3294451b31974189700341e463b6 100644 (file)
--- a/include/configs/origen.h
+++ b/include/configs/origen.h
@@ -19,8 +19,6 @@
 #define PHYS_SDRAM_1                   CONFIG_SYS_SDRAM_BASE
 #define SDRAM_BANK_SIZE                        (256 << 20)     /* 256 MB */
 
-#define CONFIG_SYS_MEM_TOP_HIDE        (1 << 20)       /* ram console */
-
 /* Power Down Modes */
 #define S5P_CHECK_SLEEP                        0x00000BAD
 #define S5P_CHECK_DIDLE                        0xBAD00000

diff --git a/include/configs/s5pc210_universal.h b/include/configs/s5pc210_universal.h
index 8cbdbc733c0bb80f62c104aaca1307c56f774d95..ae56c66e15cd9eb98372410da712e3c30cf84d0a 100644 (file)
--- a/include/configs/s5pc210_universal.h
+++ b/include/configs/s5pc210_universal.h
@@ -24,8 +24,6 @@
 #define CONFIG_SYS_INIT_SP_ADDR        (CONFIG_SYS_LOAD_ADDR \
                                        - GENERATED_GBL_DATA_SIZE)
 
-#define CONFIG_SYS_MEM_TOP_HIDE        (1 << 20)       /* ram console */
-
 /* Actual modem binary size is 16MiB. Add 2MiB for bad block handling */
 
 #define NORMAL_MTDPARTS_DEFAULT CONFIG_MTDPARTS_DEFAULT

diff --git a/include/configs/theadorable.h b/include/configs/theadorable.h
index 14817b165cfa72e24f1876f78af4cd458a7280e9..fdf048b27b3c40d5499145bef02e6ba4e7c6f474 100644 (file)
--- a/include/configs/theadorable.h
+++ b/include/configs/theadorable.h
@@ -43,9 +43,6 @@
 /* SATA support */
 #define CONFIG_LBA48
 
-/* Enable LCD and reserve 512KB from top of memory*/
-#define CONFIG_SYS_MEM_TOP_HIDE                0x80000
-
 /* FPGA programming support */
 #define CONFIG_FPGA_STRATIX_V
 

diff --git a/include/configs/trats.h b/include/configs/trats.h
index 41ac6090c27057f7e3d3277725f26b152d2a95b7..910fc150b18b08075cc807476d5437054260a251 100644 (file)
--- a/include/configs/trats.h
+++ b/include/configs/trats.h
@@ -28,8 +28,6 @@
 #define CONFIG_SYS_INIT_SP_ADDR        (CONFIG_SYS_LOAD_ADDR \
                                        - GENERATED_GBL_DATA_SIZE)
 
-#define CONFIG_SYS_MEM_TOP_HIDE        (1 << 20)       /* ram console */
-
 /* Tizen - partitions definitions */
 #define PARTS_CSA              "csa-mmc"
 #define PARTS_BOOT             "boot"

diff --git a/include/configs/trats2.h b/include/configs/trats2.h
index a980e6c47d11c07e6af09cbe7e8f846a03b29918..3e121bc6909a5179f29e2481b73defcbb778f75c 100644 (file)
--- a/include/configs/trats2.h
+++ b/include/configs/trats2.h
@@ -27,8 +27,6 @@
 #define CONFIG_SYS_INIT_SP_ADDR        (CONFIG_SYS_LOAD_ADDR \
                                        - GENERATED_GBL_DATA_SIZE)
 
-#define CONFIG_SYS_MEM_TOP_HIDE        (1 << 20)       /* ram console */
-
 /* Tizen - partitions definitions */
 #define PARTS_CSA              "csa-mmc"
 #define PARTS_BOOT             "boot"