Convert CONFIG_PHYSMEM to Kconfig

This converts the following to Kconfig:
   CONFIG_PHYSMEM

Signed-off-by: Simon Glass <sjg@chromium.org>
Suggested-by: Sean Anderson <seanga2@gmail.com>

diff --git a/README b/README
index 5dee3eea5b056a859fde3d93f736f0de5ed53276..056b717557bf3b0023b573491f48cf4d74fae442 100644 (file)
--- a/README
+++ b/README
@@ -1692,14 +1692,6 @@ The following options need to be configured:
                        HERMES, IP860, RPXlite, LWMON,
                        FLAGADM
 
-- Access to physical memory region (> 4GB)
-               Some basic support is provided for operations on memory not
-               normally accessible to U-Boot - e.g. some architectures
-               support access to more than 4GB of memory on 32-bit
-               machines using physical address extension or similar.
-               Define CONFIG_PHYSMEM to access this basic support, which
-               currently only supports clearing the memory.
-
 - Error Recovery:
                CONFIG_NET_RETRY_COUNT
 

diff --git a/arch/Kconfig b/arch/Kconfig
index fffddac04c2c45fa65222ecf80b28f82c2676951..39156067b2c10269d22e5af888cdccf55a335301 100644 (file)
--- a/arch/Kconfig
+++ b/arch/Kconfig
@@ -195,6 +195,7 @@ config SANDBOX
        imply DM_DSA
        imply CMD_EXTENSION
        imply KEYBOARD
+       imply PHYSMEM
 
 config SH
        bool "SuperH architecture"
@@ -246,6 +247,7 @@ config X86
        imply USB_ETHER_SMSC95XX
        imply USB_HOST_ETHER
        imply PCH
+       imply PHYSMEM
        imply RTC_MC146818
        imply ACPIGEN if !QEMU
        imply SYSINFO if GENERATE_SMBIOS_TABLE

diff --git a/include/configs/edison.h b/include/configs/edison.h
index 3ec35db4bcf1eda79264b08d17d6678acbb2e3bd..02f33f3c29fb6c6b076358a75ca50270c23851d0 100644 (file)
--- a/include/configs/edison.h
+++ b/include/configs/edison.h
@@ -14,9 +14,6 @@
 #define CONFIG_SYS_MAXARGS     128
 #define CONFIG_SYS_BARGSIZE    CONFIG_SYS_CBSIZE
 
-/* Memory */
-#define CONFIG_PHYSMEM
-
 #define CONFIG_SYS_STACK_SIZE                  (32 * 1024)
 
 #define CONFIG_SYS_MONITOR_BASE                        CONFIG_SYS_TEXT_BASE

diff --git a/include/configs/sandbox.h b/include/configs/sandbox.h
index 0458c72360bc8cd67f25e8272da536c89acabe2c..cd7d99ec69c0e8a62ac876c64e99053f109e3172 100644 (file)
--- a/include/configs/sandbox.h
+++ b/include/configs/sandbox.h
@@ -14,8 +14,6 @@
 
 #define CONFIG_SYS_CBSIZE              1024    /* Console I/O Buffer Size */
 
-#define CONFIG_PHYSMEM
-
 /* Size of our emulated memory */
 #define SB_CONCAT(x, y) x ## y
 #define SB_TO_UL(s) SB_CONCAT(s, UL)

diff --git a/include/configs/x86-common.h b/include/configs/x86-common.h
index ca90902c71c28f3f834bd0a660ffde6fbcb3fa94..a03913d5e794360c055a0cb8779c757fa45be902 100644 (file)
--- a/include/configs/x86-common.h
+++ b/include/configs/x86-common.h
@@ -14,8 +14,6 @@
  * High Level Configuration Options
  * (easy to change)
  */
-#define CONFIG_PHYSMEM
-
 #define CONFIG_SYS_BOOTM_LEN           (16 << 20)
 
 /* SATA AHCI storage */

diff --git a/lib/Kconfig b/lib/Kconfig
index 807a4c6ade06fec22308ef9783c4bc8d301c8a9a..10ba086b396b1dbec31d7fa8ada12d486040e7de 100644 (file)
--- a/lib/Kconfig
+++ b/lib/Kconfig
@@ -15,6 +15,16 @@ config SYS_NUM_ADDR_MAP
        help
          Sets the number of entries in the virtual-physical mapping table.
 
+config PHYSMEM
+       bool "Access to physical memory region (> 4G)"
+       help
+         Some basic support is provided for operations on memory not
+         normally accessible to 32-bit U-Boot - e.g. some architectures
+         support access to more than 4G of memory on 32-bit
+         machines using physical address extension or similar.
+         Enable this to access this basic support, which only supports clearing
+         the memory.
+
 config BCH
        bool "Enable Software based BCH ECC"
        help

diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt
index 207d1ac7af6c7f5e89dc6569752d898c0e5692c1..6d961ccb3e6917f10b010ade7369db2555ebd419 100644 (file)
--- a/scripts/config_whitelist.txt
+++ b/scripts/config_whitelist.txt
@@ -911,7 +911,6 @@ CONFIG_PCI_SYS_BUS
 CONFIG_PCI_SYS_PHYS
 CONFIG_PCI_SYS_SIZE
 CONFIG_PEN_ADDR_BIG_ENDIAN
-CONFIG_PHYSMEM
 CONFIG_PHY_BASE_ADR
 CONFIG_PHY_ET1011C_TX_CLK_FIX
 CONFIG_PHY_ID