diff options
85 files changed, 1125 insertions, 316 deletions
diff --git a/arch/powerpc/cpu/mpc83xx/Kconfig b/arch/powerpc/cpu/mpc83xx/Kconfig index f7f625aea1..8c84196b97 100644 --- a/arch/powerpc/cpu/mpc83xx/Kconfig +++ b/arch/powerpc/cpu/mpc83xx/Kconfig @@ -284,6 +284,7 @@ config ARCH_MPC837X source "arch/powerpc/cpu/mpc83xx/hrcw/Kconfig" source "arch/powerpc/cpu/mpc83xx/bats/Kconfig" +source "arch/powerpc/cpu/mpc83xx/lblaw/Kconfig" menu "Legacy options" diff --git a/arch/powerpc/cpu/mpc83xx/cpu_init.c b/arch/powerpc/cpu/mpc83xx/cpu_init.c index 7c378671fe..91451e7b30 100644 --- a/arch/powerpc/cpu/mpc83xx/cpu_init.c +++ b/arch/powerpc/cpu/mpc83xx/cpu_init.c @@ -12,6 +12,8 @@ #include <usb/ehci-ci.h> #endif +#include "lblaw/lblaw.h" + DECLARE_GLOBAL_DATA_PTR; #ifdef CONFIG_QE diff --git a/arch/powerpc/cpu/mpc83xx/lblaw/Kconfig b/arch/powerpc/cpu/mpc83xx/lblaw/Kconfig new file mode 100644 index 0000000000..b20f68b77a --- /dev/null +++ b/arch/powerpc/cpu/mpc83xx/lblaw/Kconfig @@ -0,0 +1,519 @@ +menu "LBLAW setup" + +choice + prompt "NAND LAWBAR for NAND SPL" + +config NAND_LBLAWBAR_PRELIM_NONE + bool "None" + +config NAND_LBLAWBAR_PRELIM_0 + bool "0" + depends on LBLAW0 + +config NAND_LBLAWBAR_PRELIM_1 + bool "1" + depends on LBLAW1 + +config NAND_LBLAWBAR_PRELIM_2 + bool "2" + depends on LBLAW2 + +config NAND_LBLAWBAR_PRELIM_3 + bool "3" + depends on LBLAW3 + +endchoice + +menuconfig LBLAW0 + bool "LBLAW0" + +if LBLAW0 + +config LBLAW0_ENABLE + bool "Window enable" + default "y" + +if !LBLAW0_ENABLE + +config LBLAW0_BASE + hex + default 0x0 + +endif + +if LBLAW0_ENABLE + +config LBLAW0_NAME + string "Identifier" + +config LBLAW0_BASE + hex "Window base" + +choice + prompt "Window size" + +config LBLAW0_LENGTH_4_KBYTES + bool "4 kb" + +config LBLAW0_LENGTH_8_KBYTES + bool "8 kb" + +config LBLAW0_LENGTH_16_KBYTES + bool "16 kb" + +config LBLAW0_LENGTH_32_KBYTES + bool "32 kb" + +config LBLAW0_LENGTH_64_KBYTES + bool "64 kb" + +config LBLAW0_LENGTH_128_KBYTES + bool "128 kb" + +config LBLAW0_LENGTH_256_KBYTES + bool "256 kb" + +config LBLAW0_LENGTH_512_KBYTES + bool "512 kb" + +config LBLAW0_LENGTH_1_MBYTES + bool "1 mb" + +config LBLAW0_LENGTH_2_MBYTES + bool "2 mb" + +config LBLAW0_LENGTH_4_MBYTES + bool "4 mb" + +config LBLAW0_LENGTH_8_MBYTES + bool "8 mb" + +config LBLAW0_LENGTH_16_MBYTES + bool "16 mb" + +config LBLAW0_LENGTH_32_MBYTES + bool "32 mb" + +config LBLAW0_LENGTH_64_MBYTES + bool "64 mb" + +config LBLAW0_LENGTH_128_MBYTES + bool "128 mb" + +config LBLAW0_LENGTH_256_MBYTES + bool "256 mb" + +config LBLAW0_LENGTH_512_MBYTES + bool "512 mb" + +config LBLAW0_LENGTH_1_GBYTES + bool "1 gb" + +config LBLAW0_LENGTH_2_GBYTES + bool "2 gb" + +endchoice + +endif # LBLAW0_ENABLE + +endif # LBLAW0 + +config LBLAW0_ENABLE_BIT + hex + default 0x0 if !LBLAW0_ENABLE + default 0x80000000 if LBLAW0_ENABLE + +config LBLAW0_LENGTH + hex + default 0x0 if !LBLAW0_ENABLE + default 0x0000000B if LBLAW0_LENGTH_4_KBYTES + default 0x0000000C if LBLAW0_LENGTH_8_KBYTES + default 0x0000000D if LBLAW0_LENGTH_16_KBYTES + default 0x0000000E if LBLAW0_LENGTH_32_KBYTES + default 0x0000000F if LBLAW0_LENGTH_64_KBYTES + default 0x00000010 if LBLAW0_LENGTH_128_KBYTES + default 0x00000011 if LBLAW0_LENGTH_256_KBYTES + default 0x00000012 if LBLAW0_LENGTH_512_KBYTES + default 0x00000013 if LBLAW0_LENGTH_1_MBYTES + default 0x00000014 if LBLAW0_LENGTH_2_MBYTES + default 0x00000015 if LBLAW0_LENGTH_4_MBYTES + default 0x00000016 if LBLAW0_LENGTH_8_MBYTES + default 0x00000017 if LBLAW0_LENGTH_16_MBYTES + default 0x00000018 if LBLAW0_LENGTH_32_MBYTES + default 0x00000019 if LBLAW0_LENGTH_64_MBYTES + default 0x0000001A if LBLAW0_LENGTH_128_MBYTES + default 0x0000001B if LBLAW0_LENGTH_256_MBYTES + default 0x0000001C if LBLAW0_LENGTH_512_MBYTES + default 0x0000001D if LBLAW0_LENGTH_1_GBYTES + default 0x0000001E if LBLAW0_LENGTH_2_GBYTES + +menuconfig LBLAW1 + bool "LBLAW1" + +if LBLAW1 + +config LBLAW1_ENABLE + bool "Window enable" + default "y" + +if !LBLAW1_ENABLE + +config LBLAW1_BASE + hex + default 0x0 + +endif + +if LBLAW1_ENABLE + +config LBLAW1_NAME + string "Identifier" + +config LBLAW1_BASE + hex "Window base" + +choice + prompt "Window size" + +config LBLAW1_LENGTH_4_KBYTES + bool "4 kb" + +config LBLAW1_LENGTH_8_KBYTES + bool "8 kb" + +config LBLAW1_LENGTH_16_KBYTES + bool "16 kb" + +config LBLAW1_LENGTH_32_KBYTES + bool "32 kb" + +config LBLAW1_LENGTH_64_KBYTES + bool "64 kb" + +config LBLAW1_LENGTH_128_KBYTES + bool "128 kb" + +config LBLAW1_LENGTH_256_KBYTES + bool "256 kb" + +config LBLAW1_LENGTH_512_KBYTES + bool "512 kb" + +config LBLAW1_LENGTH_1_MBYTES + bool "1 mb" + +config LBLAW1_LENGTH_2_MBYTES + bool "2 mb" + +config LBLAW1_LENGTH_4_MBYTES + bool "4 mb" + +config LBLAW1_LENGTH_8_MBYTES + bool "8 mb" + +config LBLAW1_LENGTH_16_MBYTES + bool "16 mb" + +config LBLAW1_LENGTH_32_MBYTES + bool "32 mb" + +config LBLAW1_LENGTH_64_MBYTES + bool "64 mb" + +config LBLAW1_LENGTH_128_MBYTES + bool "128 mb" + +config LBLAW1_LENGTH_256_MBYTES + bool "256 mb" + +config LBLAW1_LENGTH_512_MBYTES + bool "512 mb" + +config LBLAW1_LENGTH_1_GBYTES + bool "1 gb" + +config LBLAW1_LENGTH_2_GBYTES + bool "2 gb" + +endchoice + +endif # LBLAW1_ENABLE + +endif # LBLAW1 + +config LBLAW1_ENABLE_BIT + hex + default 0x0 if !LBLAW1_ENABLE + default 0x80000000 if LBLAW1_ENABLE + +config LBLAW1_LENGTH + hex + default 0x0 if !LBLAW1_ENABLE + default 0x0000000B if LBLAW1_LENGTH_4_KBYTES + default 0x0000000C if LBLAW1_LENGTH_8_KBYTES + default 0x0000000D if LBLAW1_LENGTH_16_KBYTES + default 0x0000000E if LBLAW1_LENGTH_32_KBYTES + default 0x0000000F if LBLAW1_LENGTH_64_KBYTES + default 0x00000010 if LBLAW1_LENGTH_128_KBYTES + default 0x00000011 if LBLAW1_LENGTH_256_KBYTES + default 0x00000012 if LBLAW1_LENGTH_512_KBYTES + default 0x00000013 if LBLAW1_LENGTH_1_MBYTES + default 0x00000014 if LBLAW1_LENGTH_2_MBYTES + default 0x00000015 if LBLAW1_LENGTH_4_MBYTES + default 0x00000016 if LBLAW1_LENGTH_8_MBYTES + default 0x00000017 if LBLAW1_LENGTH_16_MBYTES + default 0x00000018 if LBLAW1_LENGTH_32_MBYTES + default 0x00000019 if LBLAW1_LENGTH_64_MBYTES + default 0x0000001A if LBLAW1_LENGTH_128_MBYTES + default 0x0000001B if LBLAW1_LENGTH_256_MBYTES + default 0x0000001C if LBLAW1_LENGTH_512_MBYTES + default 0x0000001D if LBLAW1_LENGTH_1_GBYTES + default 0x0000001E if LBLAW1_LENGTH_2_GBYTES + +menuconfig LBLAW2 + bool "LBLAW2" + +if LBLAW2 + +config LBLAW2_ENABLE + bool "Window enable" + default "y" + +if !LBLAW2_ENABLE + +config LBLAW2_BASE + hex + default 0x0 + +endif + +if LBLAW2_ENABLE + +config LBLAW2_NAME + string "Identifier" + +config LBLAW2_BASE + hex "Window base" + +choice + prompt "Window size" + +config LBLAW2_LENGTH_4_KBYTES + bool "4 kb" + +config LBLAW2_LENGTH_8_KBYTES + bool "8 kb" + +config LBLAW2_LENGTH_16_KBYTES + bool "16 kb" + +config LBLAW2_LENGTH_32_KBYTES + bool "32 kb" + +config LBLAW2_LENGTH_64_KBYTES + bool "64 kb" + +config LBLAW2_LENGTH_128_KBYTES + bool "128 kb" + +config LBLAW2_LENGTH_256_KBYTES + bool "256 kb" + +config LBLAW2_LENGTH_512_KBYTES + bool "512 kb" + +config LBLAW2_LENGTH_1_MBYTES + bool "1 mb" + +config LBLAW2_LENGTH_2_MBYTES + bool "2 mb" + +config LBLAW2_LENGTH_4_MBYTES + bool "4 mb" + +config LBLAW2_LENGTH_8_MBYTES + bool "8 mb" + +config LBLAW2_LENGTH_16_MBYTES + bool "16 mb" + +config LBLAW2_LENGTH_32_MBYTES + bool "32 mb" + +config LBLAW2_LENGTH_64_MBYTES + bool "64 mb" + +config LBLAW2_LENGTH_128_MBYTES + bool "128 mb" + +config LBLAW2_LENGTH_256_MBYTES + bool "256 mb" + +config LBLAW2_LENGTH_512_MBYTES + bool "512 mb" + +config LBLAW2_LENGTH_1_GBYTES + bool "1 gb" + +config LBLAW2_LENGTH_2_GBYTES + bool "2 gb" + +endchoice + +endif # LBLAW2_ENABLE + +endif # LBLAW2 + +config LBLAW2_ENABLE_BIT + hex + default 0x0 if !LBLAW2_ENABLE + default 0x80000000 if LBLAW2_ENABLE + +config LBLAW2_LENGTH + hex + default 0x0 if !LBLAW2_ENABLE + default 0x0000000B if LBLAW2_LENGTH_4_KBYTES + default 0x0000000C if LBLAW2_LENGTH_8_KBYTES + default 0x0000000D if LBLAW2_LENGTH_16_KBYTES + default 0x0000000E if LBLAW2_LENGTH_32_KBYTES + default 0x0000000F if LBLAW2_LENGTH_64_KBYTES + default 0x00000010 if LBLAW2_LENGTH_128_KBYTES + default 0x00000011 if LBLAW2_LENGTH_256_KBYTES + default 0x00000012 if LBLAW2_LENGTH_512_KBYTES + default 0x00000013 if LBLAW2_LENGTH_1_MBYTES + default 0x00000014 if LBLAW2_LENGTH_2_MBYTES + default 0x00000015 if LBLAW2_LENGTH_4_MBYTES + default 0x00000016 if LBLAW2_LENGTH_8_MBYTES + default 0x00000017 if LBLAW2_LENGTH_16_MBYTES + default 0x00000018 if LBLAW2_LENGTH_32_MBYTES + default 0x00000019 if LBLAW2_LENGTH_64_MBYTES + default 0x0000001A if LBLAW2_LENGTH_128_MBYTES + default 0x0000001B if LBLAW2_LENGTH_256_MBYTES + default 0x0000001C if LBLAW2_LENGTH_512_MBYTES + default 0x0000001D if LBLAW2_LENGTH_1_GBYTES + default 0x0000001E if LBLAW2_LENGTH_2_GBYTES + +menuconfig LBLAW3 + bool "LBLAW3" + +if LBLAW3 + +config LBLAW3_ENABLE + bool "Window enable" + default "y" + +if !LBLAW3_ENABLE + +config LBLAW3_BASE + hex + default 0x0 + +endif + +if LBLAW3_ENABLE + +config LBLAW3_NAME + string "Identifier" + +config LBLAW3_BASE + hex "Window base" + +choice + prompt "Window size" + +config LBLAW3_LENGTH_4_KBYTES + bool "4 kb" + +config LBLAW3_LENGTH_8_KBYTES + bool "8 kb" + +config LBLAW3_LENGTH_16_KBYTES + bool "16 kb" + +config LBLAW3_LENGTH_32_KBYTES + bool "32 kb" + +config LBLAW3_LENGTH_64_KBYTES + bool "64 kb" + +config LBLAW3_LENGTH_128_KBYTES + bool "128 kb" + +config LBLAW3_LENGTH_256_KBYTES + bool "256 kb" + +config LBLAW3_LENGTH_512_KBYTES + bool "512 kb" + +config LBLAW3_LENGTH_1_MBYTES + bool "1 mb" + +config LBLAW3_LENGTH_2_MBYTES + bool "2 mb" + +config LBLAW3_LENGTH_4_MBYTES + bool "4 mb" + +config LBLAW3_LENGTH_8_MBYTES + bool "8 mb" + +config LBLAW3_LENGTH_16_MBYTES + bool "16 mb" + +config LBLAW3_LENGTH_32_MBYTES + bool "32 mb" + +config LBLAW3_LENGTH_64_MBYTES + bool "64 mb" + +config LBLAW3_LENGTH_128_MBYTES + bool "128 mb" + +config LBLAW3_LENGTH_256_MBYTES + bool "256 mb" + +config LBLAW3_LENGTH_512_MBYTES + bool "512 mb" + +config LBLAW3_LENGTH_1_GBYTES + bool "1 gb" + +config LBLAW3_LENGTH_2_GBYTES + bool "2 gb" + +endchoice + +endif # LBLAW3_ENABLE + +endif # LBLAW3 + +config LBLAW3_ENABLE_BIT + hex + default 0x0 if !LBLAW3_ENABLE + default 0x80000000 if LBLAW3_ENABLE + +config LBLAW3_LENGTH + hex + default 0x0 if !LBLAW3_ENABLE + default 0x0000000B if LBLAW3_LENGTH_4_KBYTES + default 0x0000000C if LBLAW3_LENGTH_8_KBYTES + default 0x0000000D if LBLAW3_LENGTH_16_KBYTES + default 0x0000000E if LBLAW3_LENGTH_32_KBYTES + default 0x0000000F if LBLAW3_LENGTH_64_KBYTES + default 0x00000010 if LBLAW3_LENGTH_128_KBYTES + default 0x00000011 if LBLAW3_LENGTH_256_KBYTES + default 0x00000012 if LBLAW3_LENGTH_512_KBYTES + default 0x00000013 if LBLAW3_LENGTH_1_MBYTES + default 0x00000014 if LBLAW3_LENGTH_2_MBYTES + default 0x00000015 if LBLAW3_LENGTH_4_MBYTES + default 0x00000016 if LBLAW3_LENGTH_8_MBYTES + default 0x00000017 if LBLAW3_LENGTH_16_MBYTES + default 0x00000018 if LBLAW3_LENGTH_32_MBYTES + default 0x00000019 if LBLAW3_LENGTH_64_MBYTES + default 0x0000001A if LBLAW3_LENGTH_128_MBYTES + default 0x0000001B if LBLAW3_LENGTH_256_MBYTES + default 0x0000001C if LBLAW3_LENGTH_512_MBYTES + default 0x0000001D if LBLAW3_LENGTH_1_GBYTES + default 0x0000001E if LBLAW3_LENGTH_2_GBYTES + +endmenu diff --git a/arch/powerpc/cpu/mpc83xx/lblaw/lblaw.h b/arch/powerpc/cpu/mpc83xx/lblaw/lblaw.h new file mode 100644 index 0000000000..6972afcc2c --- /dev/null +++ b/arch/powerpc/cpu/mpc83xx/lblaw/lblaw.h @@ -0,0 +1,55 @@ +#if defined(CONFIG_LBLAW0) +#define CONFIG_SYS_LBLAWBAR0_PRELIM \ + CONFIG_LBLAW0_BASE +#define CONFIG_SYS_LBLAWAR0_PRELIM (\ + CONFIG_LBLAW0_ENABLE_BIT |\ + CONFIG_LBLAW0_LENGTH \ +) +#endif + +#if defined(CONFIG_LBLAW1) +#define CONFIG_SYS_LBLAWBAR1_PRELIM \ + CONFIG_LBLAW1_BASE +#define CONFIG_SYS_LBLAWAR1_PRELIM (\ + CONFIG_LBLAW1_ENABLE_BIT |\ + CONFIG_LBLAW1_LENGTH \ +) +#endif + +#if defined(CONFIG_LBLAW2) +#define CONFIG_SYS_LBLAWBAR2_PRELIM \ + CONFIG_LBLAW2_BASE +#define CONFIG_SYS_LBLAWAR2_PRELIM (\ + CONFIG_LBLAW2_ENABLE_BIT |\ + CONFIG_LBLAW2_LENGTH \ +) +#endif + +#if defined(CONFIG_LBLAW3) +#define CONFIG_SYS_LBLAWBAR3_PRELIM \ + CONFIG_LBLAW3_BASE +#define CONFIG_SYS_LBLAWAR3_PRELIM (\ + CONFIG_LBLAW3_ENABLE_BIT |\ + CONFIG_LBLAW3_LENGTH \ +) +#endif + +#ifdef CONFIG_NAND_LBLAWBAR_PRELIM_0 +#define CONFIG_SYS_NAND_LBLAWBAR_PRELIM CONFIG_SYS_LBLAWBAR0_PRELIM +#define CONFIG_SYS_NAND_LBLAWAR_PRELIM CONFIG_SYS_LBLAWAR0_PRELIM +#endif + +#ifdef CONFIG_NAND_LBLAWBAR_PRELIM_1 +#define CONFIG_SYS_NAND_LBLAWBAR_PRELIM CONFIG_SYS_LBLAWBAR1_PRELIM +#define CONFIG_SYS_NAND_LBLAWAR_PRELIM CONFIG_SYS_LBLAWAR1_PRELIM +#endif + +#ifdef CONFIG_NAND_LBLAWBAR_PRELIM_2 +#define CONFIG_SYS_NAND_LBLAWBAR_PRELIM CONFIG_SYS_LBLAWBAR2_PRELIM +#define CONFIG_SYS_NAND_LBLAWAR_PRELIM CONFIG_SYS_LBLAWAR2_PRELIM +#endif + +#ifdef CONFIG_NAND_LBLAWBAR_PRELIM_3 +#define CONFIG_SYS_NAND_LBLAWBAR_PRELIM CONFIG_SYS_LBLAWBAR3_PRELIM +#define CONFIG_SYS_NAND_LBLAWAR_PRELIM CONFIG_SYS_LBLAWAR3_PRELIM +#endif diff --git a/arch/powerpc/cpu/mpc83xx/spl_minimal.c b/arch/powerpc/cpu/mpc83xx/spl_minimal.c index 2d6ba12e2d..75eb65010e 100644 --- a/arch/powerpc/cpu/mpc83xx/spl_minimal.c +++ b/arch/powerpc/cpu/mpc83xx/spl_minimal.c @@ -6,6 +6,8 @@ #include <common.h> #include <mpc83xx.h> +#include "lblaw/lblaw.h" + DECLARE_GLOBAL_DATA_PTR; /* diff --git a/configs/MPC8308RDB_defconfig b/configs/MPC8308RDB_defconfig index 14136f6b67..38c5d8d532 100644 --- a/configs/MPC8308RDB_defconfig +++ b/configs/MPC8308RDB_defconfig @@ -46,6 +46,18 @@ CONFIG_BAT3_BASE=0xE6000000 CONFIG_BAT3_ACCESS_RW=y CONFIG_BAT3_USER_MODE_VALID=y CONFIG_BAT3_SUPERVISOR_MODE_VALID=y +CONFIG_LBLAW0=y +CONFIG_LBLAW0_BASE=0xFE000000 +CONFIG_LBLAW0_NAME="FLASH" +CONFIG_LBLAW0_LENGTH_8_MBYTES=y +CONFIG_LBLAW1=y +CONFIG_LBLAW1_BASE=0xE0600000 +CONFIG_LBLAW1_NAME="NAND" +CONFIG_LBLAW1_LENGTH_32_KBYTES=y +CONFIG_LBLAW2=y +CONFIG_LBLAW2_BASE=0xF0000000 +CONFIG_LBLAW2_NAME="VSC7385" +CONFIG_LBLAW2_LENGTH_128_KBYTES=y CONFIG_FIT=y CONFIG_FIT_VERBOSE=y CONFIG_OF_BOARD_SETUP=y diff --git a/configs/MPC8313ERDB_33_defconfig b/configs/MPC8313ERDB_33_defconfig index 8e34ee2c2b..5783165e5d 100644 --- a/configs/MPC8313ERDB_33_defconfig +++ b/configs/MPC8313ERDB_33_defconfig @@ -57,6 +57,22 @@ CONFIG_BAT6_ICACHE_GUARDED=y CONFIG_BAT6_DCACHE_GUARDED=y CONFIG_BAT6_USER_MODE_VALID=y CONFIG_BAT6_SUPERVISOR_MODE_VALID=y +CONFIG_LBLAW0=y +CONFIG_LBLAW0_BASE=0xFE000000 +CONFIG_LBLAW0_NAME="FLASH" +CONFIG_LBLAW0_LENGTH_16_MBYTES=y +CONFIG_LBLAW1=y +CONFIG_LBLAW1_BASE=0xE2800000 +CONFIG_LBLAW1_NAME="NAND" +CONFIG_LBLAW1_LENGTH_32_KBYTES=y +CONFIG_LBLAW2=y +CONFIG_LBLAW2_BASE=0xF0000000 +CONFIG_LBLAW2_NAME="VSC7385" +CONFIG_LBLAW2_LENGTH_128_KBYTES=y +CONFIG_LBLAW3=y +CONFIG_LBLAW3_BASE=0xFA000000 +CONFIG_LBLAW3_NAME="BCSR" +CONFIG_LBLAW3_LENGTH_32_KBYTES=y CONFIG_OF_BOARD_SETUP=y CONFIG_OF_STDOUT_VIA_ALIAS=y CONFIG_SYS_EXTRA_OPTIONS="SYS_33MHZ" diff --git a/configs/MPC8313ERDB_66_defconfig b/configs/MPC8313ERDB_66_defconfig index a2f7eb5837..2395b8e397 100644 --- a/configs/MPC8313ERDB_66_defconfig +++ b/configs/MPC8313ERDB_66_defconfig @@ -56,6 +56,22 @@ CONFIG_BAT6_ICACHE_GUARDED=y CONFIG_BAT6_DCACHE_GUARDED=y CONFIG_BAT6_USER_MODE_VALID=y CONFIG_BAT6_SUPERVISOR_MODE_VALID=y +CONFIG_LBLAW0=y +CONFIG_LBLAW0_BASE=0xFE000000 +CONFIG_LBLAW0_NAME="FLASH" +CONFIG_LBLAW0_LENGTH_16_MBYTES=y +CONFIG_LBLAW1=y +CONFIG_LBLAW1_BASE=0xE2800000 +CONFIG_LBLAW1_NAME="NAND" +CONFIG_LBLAW1_LENGTH_32_KBYTES=y +CONFIG_LBLAW2=y +CONFIG_LBLAW2_BASE=0xF0000000 +CONFIG_LBLAW2_NAME="VSC7385" +CONFIG_LBLAW2_LENGTH_128_KBYTES=y +CONFIG_LBLAW3=y +CONFIG_LBLAW3_BASE=0xFA000000 +CONFIG_LBLAW3_NAME="BCSR" +CONFIG_LBLAW3_LENGTH_32_KBYTES=y CONFIG_OF_BOARD_SETUP=y CONFIG_OF_STDOUT_VIA_ALIAS=y CONFIG_SYS_EXTRA_OPTIONS="SYS_66MHZ" diff --git a/configs/MPC8313ERDB_NAND_33_defconfig b/configs/MPC8313ERDB_NAND_33_defconfig index 9946bf965e..ce97914934 100644 --- a/configs/MPC8313ERDB_NAND_33_defconfig +++ b/configs/MPC8313ERDB_NAND_33_defconfig @@ -58,6 +58,23 @@ CONFIG_BAT6_ICACHE_GUARDED=y CONFIG_BAT6_DCACHE_GUARDED=y CONFIG_BAT6_USER_MODE_VALID=y CONFIG_BAT6_SUPERVISOR_MODE_VALID=y +CONFIG_NAND_LBLAWBAR_PRELIM_1=y +CONFIG_LBLAW0=y +CONFIG_LBLAW0_BASE=0xFE000000 +CONFIG_LBLAW0_NAME="FLASH" +CONFIG_LBLAW0_LENGTH_16_MBYTES=y +CONFIG_LBLAW1=y +CONFIG_LBLAW1_BASE=0xE2800000 +CONFIG_LBLAW1_NAME="NAND" +CONFIG_LBLAW1_LENGTH_32_KBYTES=y +CONFIG_LBLAW2=y +CONFIG_LBLAW2_BASE=0xF0000000 +CONFIG_LBLAW2_NAME="VSC7385" +CONFIG_LBLAW2_LENGTH_128_KBYTES=y +CONFIG_LBLAW3=y +CONFIG_LBLAW3_BASE=0xFA000000 +CONFIG_LBLAW3_NAME="BCSR" +CONFIG_LBLAW3_LENGTH_32_KBYTES=y CONFIG_OF_BOARD_SETUP=y CONFIG_OF_STDOUT_VIA_ALIAS=y CONFIG_SYS_EXTRA_OPTIONS="SYS_33MHZ" diff --git a/configs/MPC8313ERDB_NAND_66_defconfig b/configs/MPC8313ERDB_NAND_66_defconfig index ffa22bfb83..92d33b07db 100644 --- a/configs/MPC8313ERDB_NAND_66_defconfig +++ b/configs/MPC8313ERDB_NAND_66_defconfig @@ -57,6 +57,23 @@ CONFIG_BAT6_ICACHE_GUARDED=y CONFIG_BAT6_DCACHE_GUARDED=y CONFIG_BAT6_USER_MODE_VALID=y CONFIG_BAT6_SUPERVISOR_MODE_VALID=y +CONFIG_NAND_LBLAWBAR_PRELIM_1=y +CONFIG_LBLAW0=y +CONFIG_LBLAW0_BASE=0xFE000000 +CONFIG_LBLAW0_NAME="FLASH" +CONFIG_LBLAW0_LENGTH_16_MBYTES=y +CONFIG_LBLAW1=y +CONFIG_LBLAW1_BASE=0xE2800000 +CONFIG_LBLAW1_NAME="NAND" +CONFIG_LBLAW1_LENGTH_32_KBYTES=y +CONFIG_LBLAW2=y +CONFIG_LBLAW2_BASE=0xF0000000 +CONFIG_LBLAW2_NAME="VSC7385" +CONFIG_LBLAW2_LENGTH_128_KBYTES=y +CONFIG_LBLAW3=y +CONFIG_LBLAW3_BASE=0xFA000000 +CONFIG_LBLAW3_NAME="BCSR" +CONFIG_LBLAW3_LENGTH_32_KBYTES=y CONFIG_OF_BOARD_SETUP=y CONFIG_OF_STDOUT_VIA_ALIAS=y CONFIG_SYS_EXTRA_OPTIONS="SYS_66MHZ" diff --git a/configs/MPC8315ERDB_defconfig b/configs/MPC8315ERDB_defconfig index 43daee1f19..b6e43b66aa 100644 --- a/configs/MPC8315ERDB_defconfig +++ b/configs/MPC8315ERDB_defconfig @@ -68,6 +68,14 @@ CONFIG_BAT5_DCACHE_INHIBITED=y CONFIG_BAT5_DCACHE_GUARDED=y CONFIG_BAT5_USER_MODE_VALID=y CONFIG_BAT5_SUPERVISOR_MODE_VALID=y +CONFIG_LBLAW0=y +CONFIG_LBLAW0_BASE=0xFE000000 +CONFIG_LBLAW0_NAME="FLASH" +CONFIG_LBLAW0_LENGTH_8_MBYTES=y +CONFIG_LBLAW1=y +CONFIG_LBLAW1_BASE=0xE0600000 +CONFIG_LBLAW1_NAME="NAND" +CONFIG_LBLAW1_LENGTH_32_KBYTES=y CONFIG_OF_BOARD_SETUP=y CONFIG_OF_STDOUT_VIA_ALIAS=y CONFIG_BOOTDELAY=6 diff --git a/configs/MPC8323ERDB_defconfig b/configs/MPC8323ERDB_defconfig index 9039652d4b..7243cf67f9 100644 --- a/configs/MPC8323ERDB_defconfig +++ b/configs/MPC8323ERDB_defconfig @@ -66,6 +66,10 @@ CONFIG_BAT6_DCACHE_INHIBITED=y CONFIG_BAT6_DCACHE_GUARDED=y CONFIG_BAT6_USER_MODE_VALID=y CONFIG_BAT6_SUPERVISOR_MODE_VALID=y +CONFIG_LBLAW0=y +CONFIG_LBLAW0_BASE=0xFE000000 +CONFIG_LBLAW0_NAME="FLASH" +CONFIG_LBLAW0_LENGTH_32_MBYTES=y CONFIG_OF_BOARD_SETUP=y CONFIG_OF_STDOUT_VIA_ALIAS=y CONFIG_BOOTDELAY=6 diff --git a/configs/MPC832XEMDS_ATM_defconfig b/configs/MPC832XEMDS_ATM_defconfig index aefb01f150..8cbc14022b 100644 --- a/configs/MPC832XEMDS_ATM_defconfig +++ b/configs/MPC832XEMDS_ATM_defconfig @@ -56,6 +56,18 @@ CONFIG_BAT5_BASE=0xE6000000 CONFIG_BAT5_ACCESS_RW=y CONFIG_BAT5_USER_MODE_VALID=y CONFIG_BAT5_SUPERVISOR_MODE_VALID=y +CONFIG_LBLAW0=y +CONFIG_LBLAW0_BASE=0xFE000000 +CONFIG_LBLAW0_NAME="FLASH" +CONFIG_LBLAW0_LENGTH_32_MBYTES=y +CONFIG_LBLAW1=y +CONFIG_LBLAW1_BASE=0xF8000000 +CONFIG_LBLAW1_NAME="BCSR" +CONFIG_LBLAW1_LENGTH_32_KBYTES=y +CONFIG_LBLAW3=y +CONFIG_LBLAW3_BASE=0xF8008000 +CONFIG_LBLAW3_NAME="PIB" +CONFIG_LBLAW3_LENGTH_64_KBYTES=y CONFIG_OF_BOARD_SETUP=y CONFIG_OF_STDOUT_VIA_ALIAS=y CONFIG_SYS_EXTRA_OPTIONS="PQ_MDS_PIB=1,PQ_MDS_PIB_ATM=1" diff --git a/configs/MPC832XEMDS_HOST_33_defconfig b/configs/MPC832XEMDS_HOST_33_defconfig index f410f8dac0..487d1d8544 100644 --- a/configs/MPC832XEMDS_HOST_33_defconfig +++ b/configs/MPC832XEMDS_HOST_33_defconfig @@ -76,6 +76,18 @@ CONFIG_BAT7_DCACHE_INHIBITED=y CONFIG_BAT7_DCACHE_GUARDED=y CONFIG_BAT7_USER_MODE_VALID=y CONFIG_BAT7_SUPERVISOR_MODE_VALID=y +CONFIG_LBLAW0=y +CONFIG_LBLAW0_BASE=0xFE000000 +CONFIG_LBLAW0_NAME="FLASH" +CONFIG_LBLAW0_LENGTH_32_MBYTES=y +CONFIG_LBLAW1=y +CONFIG_LBLAW1_BASE=0xF8000000 +CONFIG_LBLAW1_NAME="BCSR" +CONFIG_LBLAW1_LENGTH_32_KBYTES=y +CONFIG_LBLAW3=y +CONFIG_LBLAW3_BASE=0xF8008000 +CONFIG_LBLAW3_NAME="PIB" +CONFIG_LBLAW3_LENGTH_64_KBYTES=y CONFIG_OF_BOARD_SETUP=y CONFIG_OF_STDOUT_VIA_ALIAS=y CONFIG_SYS_EXTRA_OPTIONS="PCI_33M,PQ_MDS_PIB=1" diff --git a/configs/MPC832XEMDS_HOST_66_defconfig b/configs/MPC832XEMDS_HOST_66_defconfig index dac8f28a4d..10ea03422c 100644 --- a/configs/MPC832XEMDS_HOST_66_defconfig +++ b/configs/MPC832XEMDS_HOST_66_defconfig @@ -76,6 +76,18 @@ CONFIG_BAT7_DCACHE_INHIBITED=y CONFIG_BAT7_DCACHE_GUARDED=y CONFIG_BAT7_USER_MODE_VALID=y CONFIG_BAT7_SUPERVISOR_MODE_VALID=y +CONFIG_LBLAW0=y +CONFIG_LBLAW0_BASE=0xFE000000 +CONFIG_LBLAW0_NAME="FLASH" +CONFIG_LBLAW0_LENGTH_32_MBYTES=y +CONFIG_LBLAW1=y +CONFIG_LBLAW1_BASE=0xF8000000 +CONFIG_LBLAW1_NAME="BCSR" +CONFIG_LBLAW1_LENGTH_32_KBYTES=y +CONFIG_LBLAW3=y +CONFIG_LBLAW3_BASE=0xF8008000 +CONFIG_LBLAW3_NAME="PIB" +CONFIG_LBLAW3_LENGTH_64_KBYTES=y CONFIG_OF_BOARD_SETUP=y CONFIG_OF_STDOUT_VIA_ALIAS=y CONFIG_SYS_EXTRA_OPTIONS="PCI_66M,PQ_MDS_PIB=1" diff --git a/configs/MPC832XEMDS_SLAVE_defconfig b/configs/MPC832XEMDS_SLAVE_defconfig index c1cb69ad93..b1afa2fa47 100644 --- a/configs/MPC832XEMDS_SLAVE_defconfig +++ b/configs/MPC832XEMDS_SLAVE_defconfig @@ -73,6 +73,18 @@ CONFIG_BAT7_DCACHE_INHIBITED=y CONFIG_BAT7_DCACHE_GUARDED=y CONFIG_BAT7_USER_MODE_VALID=y CONFIG_BAT7_SUPERVISOR_MODE_VALID=y +CONFIG_LBLAW0=y +CONFIG_LBLAW0_BASE=0xFE000000 +CONFIG_LBLAW0_NAME="FLASH" +CONFIG_LBLAW0_LENGTH_32_MBYTES=y +CONFIG_LBLAW1=y +CONFIG_LBLAW1_BASE=0xF8000000 +CONFIG_LBLAW1_NAME="BCSR" +CONFIG_LBLAW1_LENGTH_32_KBYTES=y +CONFIG_LBLAW3=y +CONFIG_LBLAW3_BASE=0xF8008000 +CONFIG_LBLAW3_NAME="PIB" +CONFIG_LBLAW3_LENGTH_64_KBYTES=y CONFIG_OF_BOARD_SETUP=y CONFIG_OF_STDOUT_VIA_ALIAS=y CONFIG_SYS_EXTRA_OPTIONS="PCISLAVE" diff --git a/configs/MPC832XEMDS_defconfig b/configs/MPC832XEMDS_defconfig index 38e0b7f6de..a9bb8a7713 100644 --- a/configs/MPC832XEMDS_defconfig +++ b/configs/MPC832XEMDS_defconfig @@ -56,6 +56,18 @@ CONFIG_BAT5_BASE=0xE6000000 CONFIG_BAT5_ACCESS_RW=y CONFIG_BAT5_USER_MODE_VALID=y CONFIG_BAT5_SUPERVISOR_MODE_VALID=y +CONFIG_LBLAW0=y +CONFIG_LBLAW0_BASE=0xFE000000 +CONFIG_LBLAW0_NAME="FLASH" +CONFIG_LBLAW0_LENGTH_32_MBYTES=y +CONFIG_LBLAW1=y +CONFIG_LBLAW1_BASE=0xF8000000 +CONFIG_LBLAW1_NAME="BCSR" +CONFIG_LBLAW1_LENGTH_32_KBYTES=y +CONFIG_LBLAW3=y +CONFIG_LBLAW3_BASE=0xF8008000 +CONFIG_LBLAW3_NAME="PIB" +CONFIG_LBLAW3_LENGTH_64_KBYTES=y CONFIG_OF_BOARD_SETUP=y CONFIG_OF_STDOUT_VIA_ALIAS=y CONFIG_BOOTDELAY=6 diff --git a/configs/MPC8349EMDS_PCI64_defconfig b/configs/MPC8349EMDS_PCI64_defconfig index 6daab44b62..28779bbeb7 100644 --- a/configs/MPC8349EMDS_PCI64_defconfig +++ b/configs/MPC8349EMDS_PCI64_defconfig @@ -45,6 +45,14 @@ CONFIG_BAT6_DCACHE_MEMORYCOHERENCE=y CONFIG_BAT6_DCACHE_GUARDED=y CONFIG_BAT6_USER_MODE_VALID=y CONFIG_BAT6_SUPERVISOR_MODE_VALID=y +CONFIG_LBLAW0=y +CONFIG_LBLAW0_BASE=0xFE000000 +CONFIG_LBLAW0_NAME="FLASH" +CONFIG_LBLAW0_LENGTH_32_MBYTES=y +CONFIG_LBLAW1=y +CONFIG_LBLAW1_BASE=0xE2400000 +CONFIG_LBLAW1_NAME="BCSR" +CONFIG_LBLAW1_LENGTH_32_KBYTES=y CONFIG_OF_BOARD_SETUP=y CONFIG_OF_STDOUT_VIA_ALIAS=y CONFIG_BOOTDELAY=6 diff --git a/configs/MPC8349EMDS_SDRAM_defconfig b/configs/MPC8349EMDS_SDRAM_defconfig index d3f42f99e0..a157066968 100644 --- a/configs/MPC8349EMDS_SDRAM_defconfig +++ b/configs/MPC8349EMDS_SDRAM_defconfig @@ -45,6 +45,18 @@ CONFIG_BAT6_DCACHE_MEMORYCOHERENCE=y CONFIG_BAT6_DCACHE_GUARDED=y CONFIG_BAT6_USER_MODE_VALID=y CONFIG_BAT6_SUPERVISOR_MODE_VALID=y +CONFIG_LBLAW0=y +CONFIG_LBLAW0_BASE=0xFE000000 +CONFIG_LBLAW0_NAME="FLASH" +CONFIG_LBLAW0_LENGTH_32_MBYTES=y +CONFIG_LBLAW1=y +CONFIG_LBLAW1_BASE=0xE2400000 +CONFIG_LBLAW1_NAME="BCSR" +CONFIG_LBLAW1_LENGTH_32_KBYTES=y +CONFIG_LBLAW2=y +CONFIG_LBLAW2_BASE=0xF0000000 +CONFIG_LBLAW2_NAME="SDRAM" +CONFIG_LBLAW2_LENGTH_64_MBYTES=y CONFIG_PCI_ONE_PCI1=y CONFIG_OF_BOARD_SETUP=y CONFIG_OF_STDOUT_VIA_ALIAS=y diff --git a/configs/MPC8349EMDS_SLAVE_defconfig b/configs/MPC8349EMDS_SLAVE_defconfig index c264f7b53d..588d9420f1 100644 --- a/configs/MPC8349EMDS_SLAVE_defconfig +++ b/configs/MPC8349EMDS_SLAVE_defconfig @@ -43,6 +43,14 @@ CONFIG_BAT6_DCACHE_MEMORYCOHERENCE=y CONFIG_BAT6_DCACHE_GUARDED=y CONFIG_BAT6_USER_MODE_VALID=y CONFIG_BAT6_SUPERVISOR_MODE_VALID=y +CONFIG_LBLAW0=y +CONFIG_LBLAW0_BASE=0xFE000000 +CONFIG_LBLAW0_NAME="FLASH" +CONFIG_LBLAW0_LENGTH_32_MBYTES=y +CONFIG_LBLAW1=y +CONFIG_LBLAW1_BASE=0xE2400000 +CONFIG_LBLAW1_NAME="BCSR" +CONFIG_LBLAW1_LENGTH_32_KBYTES=y CONFIG_PCI_ONE_PCI1=y CONFIG_OF_BOARD_SETUP=y CONFIG_OF_STDOUT_VIA_ALIAS=y diff --git a/configs/MPC8349EMDS_defconfig b/configs/MPC8349EMDS_defconfig index 4018d81825..a38edb5293 100644 --- a/configs/MPC8349EMDS_defconfig +++ b/configs/MPC8349EMDS_defconfig @@ -45,6 +45,14 @@ CONFIG_BAT6_DCACHE_MEMORYCOHERENCE=y CONFIG_BAT6_DCACHE_GUARDED=y CONFIG_BAT6_USER_MODE_VALID=y CONFIG_BAT6_SUPERVISOR_MODE_VALID=y +CONFIG_LBLAW0=y +CONFIG_LBLAW0_BASE=0xFE000000 +CONFIG_LBLAW0_NAME="FLASH" +CONFIG_LBLAW0_LENGTH_32_MBYTES=y +CONFIG_LBLAW1=y +CONFIG_LBLAW1_BASE=0xE2400000 +CONFIG_LBLAW1_NAME="BCSR" +CONFIG_LBLAW1_LENGTH_32_KBYTES=y CONFIG_PCI_ONE_PCI1=y CONFIG_OF_BOARD_SETUP=y CONFIG_OF_STDOUT_VIA_ALIAS=y diff --git a/configs/MPC8349ITXGP_defconfig b/configs/MPC8349ITXGP_defconfig index 0434118419..844b897329 100644 --- a/configs/MPC8349ITXGP_defconfig +++ b/configs/MPC8349ITXGP_defconfig @@ -85,6 +85,18 @@ CONFIG_BAT6_DCACHE_MEMORYCOHERENCE=y CONFIG_BAT6_DCACHE_GUARDED=y CONFIG_BAT6_USER_MODE_VALID=y CONFIG_BAT6_SUPERVISOR_MODE_VALID=y +CONFIG_LBLAW0=y +CONFIG_LBLAW0_BASE=0xFE000000 +CONFIG_LBLAW0_NAME="FLASH" +CONFIG_LBLAW0_LENGTH_16_MBYTES=y +CONFIG_LBLAW1=y +CONFIG_LBLAW1_BASE=0xF8000000 +CONFIG_LBLAW1_NAME="VSC7385" +CONFIG_LBLAW1_LENGTH_128_KBYTES=y +CONFIG_LBLAW3=y +CONFIG_LBLAW3_BASE=0xF0000000 +CONFIG_LBLAW3_NAME="CF" +CONFIG_LBLAW3_LENGTH_64_KBYTES=y CONFIG_OF_BOARD_SETUP=y CONFIG_OF_STDOUT_VIA_ALIAS=y CONFIG_SYS_EXTRA_OPTIONS="SYS_TEXT_BASE=0xFE000000" diff --git a/configs/MPC8349ITX_LOWBOOT_defconfig b/configs/MPC8349ITX_LOWBOOT_defconfig index de97bb15b2..91ed6686f8 100644 --- a/configs/MPC8349ITX_LOWBOOT_defconfig +++ b/configs/MPC8349ITX_LOWBOOT_defconfig @@ -85,6 +85,18 @@ CONFIG_BAT6_DCACHE_MEMORYCOHERENCE=y CONFIG_BAT6_DCACHE_GUARDED=y CONFIG_BAT6_USER_MODE_VALID=y CONFIG_BAT6_SUPERVISOR_MODE_VALID=y +CONFIG_LBLAW0=y +CONFIG_LBLAW0_BASE=0xFE000000 +CONFIG_LBLAW0_NAME="FLASH" +CONFIG_LBLAW0_LENGTH_16_MBYTES=y +CONFIG_LBLAW1=y +CONFIG_LBLAW1_BASE=0xF8000000 +CONFIG_LBLAW1_NAME="VSC7385" +CONFIG_LBLAW1_LENGTH_128_KBYTES=y +CONFIG_LBLAW3=y +CONFIG_LBLAW3_BASE=0xF0000000 +CONFIG_LBLAW3_NAME="CF" +CONFIG_LBLAW3_LENGTH_64_KBYTES=y CONFIG_OF_BOARD_SETUP=y CONFIG_OF_STDOUT_VIA_ALIAS=y CONFIG_BOOTDELAY=6 diff --git a/configs/MPC8349ITX_defconfig b/configs/MPC8349ITX_defconfig index b1e687ceab..cfa31c7230 100644 --- a/configs/MPC8349ITX_defconfig +++ b/configs/MPC8349ITX_defconfig @@ -84,6 +84,18 @@ CONFIG_BAT6_DCACHE_MEMORYCOHERENCE=y CONFIG_BAT6_DCACHE_GUARDED=y CONFIG_BAT6_USER_MODE_VALID=y CONFIG_BAT6_SUPERVISOR_MODE_VALID=y +CONFIG_LBLAW0=y +CONFIG_LBLAW0_BASE=0xFE000000 +CONFIG_LBLAW0_NAME="FLASH" +CONFIG_LBLAW0_LENGTH_16_MBYTES=y +CONFIG_LBLAW1=y +CONFIG_LBLAW1_BASE=0xF8000000 +CONFIG_LBLAW1_NAME="VSC7385" +CONFIG_LBLAW1_LENGTH_128_KBYTES=y +CONFIG_LBLAW3=y +CONFIG_LBLAW3_BASE=0xF0000000 +CONFIG_LBLAW3_NAME="CF" +CONFIG_LBLAW3_LENGTH_64_KBYTES=y CONFIG_OF_BOARD_SETUP=y CONFIG_OF_STDOUT_VIA_ALIAS=y CONFIG_BOOTDELAY=6 diff --git a/configs/MPC837XEMDS_HOST_defconfig b/configs/MPC837XEMDS_HOST_defconfig index 86b9f6071a..4cc36a5c7f 100644 --- a/configs/MPC837XEMDS_HOST_defconfig +++ b/configs/MPC837XEMDS_HOST_defconfig @@ -89,6 +89,18 @@ CONFIG_BAT7_DCACHE_INHIBITED=y CONFIG_BAT7_DCACHE_GUARDED=y CONFIG_BAT7_USER_MODE_VALID=y CONFIG_BAT7_SUPERVISOR_MODE_VALID=y +CONFIG_LBLAW0=y +CONFIG_LBLAW0_BASE=0xFE000000 +CONFIG_LBLAW0_NAME="FLASH" +CONFIG_LBLAW0_LENGTH_32_MBYTES=y +CONFIG_LBLAW1=y +CONFIG_LBLAW1_BASE=0xF8000000 +CONFIG_LBLAW1_NAME="BCSR" +CONFIG_LBLAW1_LENGTH_32_KBYTES=y +CONFIG_LBLAW3=y +CONFIG_LBLAW3_BASE=0xE0600000 +CONFIG_LBLAW3_NAME="NAND" +CONFIG_LBLAW3_LENGTH_32_KBYTES=y CONFIG_OF_BOARD_SETUP=y CONFIG_OF_STDOUT_VIA_ALIAS=y CONFIG_BOOTDELAY=6 diff --git a/configs/MPC837XEMDS_SLAVE_defconfig b/configs/MPC837XEMDS_SLAVE_defconfig index 44c23eade5..ba58e49ba2 100644 --- a/configs/MPC837XEMDS_SLAVE_defconfig +++ b/configs/MPC837XEMDS_SLAVE_defconfig @@ -49,6 +49,18 @@ CONFIG_BAT3_DCACHE_INHIBITED=y CONFIG_BAT3_DCACHE_GUARDED=y CONFIG_BAT3_USER_MODE_VALID=y CONFIG_BAT3_SUPERVISOR_MODE_VALID=y +CONFIG_LBLAW0=y +CONFIG_LBLAW0_BASE=0xFE000000 +CONFIG_LBLAW0_NAME="FLASH" +CONFIG_LBLAW0_LENGTH_32_MBYTES=y +CONFIG_LBLAW1=y +CONFIG_LBLAW1_BASE=0xF8000000 +CONFIG_LBLAW1_NAME="BCSR" +CONFIG_LBLAW1_LENGTH_32_KBYTES=y +CONFIG_LBLAW3=y +CONFIG_LBLAW3_BASE=0xE0600000 +CONFIG_LBLAW3_NAME="NAND" +CONFIG_LBLAW3_LENGTH_32_KBYTES=y CONFIG_OF_BOARD_SETUP=y CONFIG_OF_STDOUT_VIA_ALIAS=y CONFIG_SYS_EXTRA_OPTIONS="PCISLAVE" diff --git a/configs/MPC837XEMDS_defconfig b/configs/MPC837XEMDS_defconfig index f21cdbd179..b3c1c87824 100644 --- a/configs/MPC837XEMDS_defconfig +++ b/configs/MPC837XEMDS_defconfig @@ -69,6 +69,18 @@ CONFIG_BAT5_BASE=0xE6000000 CONFIG_BAT5_ACCESS_RW=y CONFIG_BAT5_USER_MODE_VALID=y CONFIG_BAT5_SUPERVISOR_MODE_VALID=y +CONFIG_LBLAW0=y +CONFIG_LBLAW0_BASE=0xFE000000 +CONFIG_LBLAW0_NAME="FLASH" +CONFIG_LBLAW0_LENGTH_32_MBYTES=y +CONFIG_LBLAW1=y +CONFIG_LBLAW1_BASE=0xF8000000 +CONFIG_LBLAW1_NAME="BCSR" +CONFIG_LBLAW1_LENGTH_32_KBYTES=y +CONFIG_LBLAW3=y +CONFIG_LBLAW3_BASE=0xE0600000 +CONFIG_LBLAW3_NAME="NAND" +CONFIG_LBLAW3_LENGTH_32_KBYTES=y CONFIG_OF_BOARD_SETUP=y CONFIG_OF_STDOUT_VIA_ALIAS=y CONFIG_BOOTDELAY=6 diff --git a/configs/MPC837XERDB_SLAVE_defconfig b/configs/MPC837XERDB_SLAVE_defconfig index d1455b0e9d..07016936d6 100644 --- a/configs/MPC837XERDB_SLAVE_defconfig +++ b/configs/MPC837XERDB_SLAVE_defconfig @@ -49,6 +49,18 @@ CONFIG_BAT3_DCACHE_INHIBITED=y CONFIG_BAT3_DCACHE_GUARDED=y CONFIG_BAT3_USER_MODE_VALID=y CONFIG_BAT3_SUPERVISOR_MODE_VALID=y +CONFIG_LBLAW0=y +CONFIG_LBLAW0_BASE=0xFE000000 +CONFIG_LBLAW0_NAME="FLASH" +CONFIG_LBLAW0_LENGTH_8_MBYTES=y +CONFIG_LBLAW1=y +CONFIG_LBLAW1_BASE=0xE0600000 +CONFIG_LBLAW1_NAME="NAND" +CONFIG_LBLAW1_LENGTH_32_KBYTES=y +CONFIG_LBLAW2=y +CONFIG_LBLAW2_BASE=0xF0000000 +CONFIG_LBLAW2_NAME="VSC7385" +CONFIG_LBLAW2_LENGTH_128_KBYTES=y CONFIG_OF_BOARD_SETUP=y CONFIG_OF_STDOUT_VIA_ALIAS=y CONFIG_SYS_EXTRA_OPTIONS="PCISLAVE,PCIE" diff --git a/configs/MPC837XERDB_defconfig b/configs/MPC837XERDB_defconfig index e6138c06fc..59d591fa05 100644 --- a/configs/MPC837XERDB_defconfig +++ b/configs/MPC837XERDB_defconfig @@ -89,6 +89,18 @@ CONFIG_BAT7_DCACHE_INHIBITED=y CONFIG_BAT7_DCACHE_GUARDED=y CONFIG_BAT7_USER_MODE_VALID=y CONFIG_BAT7_SUPERVISOR_MODE_VALID=y +CONFIG_LBLAW0=y +CONFIG_LBLAW0_BASE=0xFE000000 +CONFIG_LBLAW0_NAME="FLASH" +CONFIG_LBLAW0_LENGTH_8_MBYTES=y +CONFIG_LBLAW1=y +CONFIG_LBLAW1_BASE=0xE0600000 +CONFIG_LBLAW1_NAME="NAND" +CONFIG_LBLAW1_LENGTH_32_KBYTES=y +CONFIG_LBLAW2=y +CONFIG_LBLAW2_BASE=0xF0000000 +CONFIG_LBLAW2_NAME="VSC7385" +CONFIG_LBLAW2_LENGTH_128_KBYTES=y CONFIG_OF_BOARD_SETUP=y CONFIG_OF_STDOUT_VIA_ALIAS=y CONFIG_SYS_EXTRA_OPTIONS="PCIE" diff --git a/configs/TQM834x_defconfig b/configs/TQM834x_defconfig index 677f0513a3..fdaded2970 100644 --- a/configs/TQM834x_defconfig +++ b/configs/TQM834x_defconfig @@ -92,6 +92,16 @@ CONFIG_BAT7_DCACHE_INHIBITED=y CONFIG_BAT7_DCACHE_GUARDED=y CONFIG_BAT7_USER_MODE_VALID=y CONFIG_BAT7_SUPERVISOR_MODE_VALID=y +CONFIG_LBLAW0=y +CONFIG_LBLAW0_BASE=0x80000000 +CONFIG_LBLAW0_NAME="FLASH" +CONFIG_LBLAW0_LENGTH_1_GBYTES=y +CONFIG_LBLAW1=y +# CONFIG_LBLAW1_ENABLE is not set +CONFIG_LBLAW2=y +# CONFIG_LBLAW2_ENABLE is not set +CONFIG_LBLAW3=y +# CONFIG_LBLAW3_ENABLE is not set CONFIG_OF_BOARD_SETUP=y CONFIG_OF_STDOUT_VIA_ALIAS=y CONFIG_BOOTDELAY=6 diff --git a/configs/caddy2_defconfig b/configs/caddy2_defconfig index 2665e72573..12721f8db4 100644 --- a/configs/caddy2_defconfig +++ b/configs/caddy2_defconfig @@ -63,6 +63,14 @@ CONFIG_BAT6_ICACHE_MEMORYCOHERENCE=y CONFIG_BAT6_DCACHE_MEMORYCOHERENCE=y CONFIG_BAT6_USER_MODE_VALID=y CONFIG_BAT6_SUPERVISOR_MODE_VALID=y +CONFIG_LBLAW0=y +CONFIG_LBLAW0_BASE=0xFFC00000 +CONFIG_LBLAW0_NAME="FLASH" +CONFIG_LBLAW0_LENGTH_4_MBYTES=y +CONFIG_LBLAW1=y +CONFIG_LBLAW1_BASE=0xF0000000 +CONFIG_LBLAW1_NAME="WINDOW1" +CONFIG_LBLAW1_LENGTH_256_KBYTES=y CONFIG_OF_BOARD_SETUP=y CONFIG_OF_STDOUT_VIA_ALIAS=y CONFIG_BOOTDELAY=6 diff --git a/configs/hrcon_defconfig b/configs/hrcon_defconfig index deed831c11..f1aa24683c 100644 --- a/configs/hrcon_defconfig +++ b/configs/hrcon_defconfig @@ -46,6 +46,14 @@ CONFIG_BAT3_BASE=0xE6000000 CONFIG_BAT3_ACCESS_RW=y CONFIG_BAT3_USER_MODE_VALID=y CONFIG_BAT3_SUPERVISOR_MODE_VALID=y +CONFIG_LBLAW0=y +CONFIG_LBLAW0_BASE=0xFE000000 +CONFIG_LBLAW0_NAME="FLASH" +CONFIG_LBLAW0_LENGTH_8_MBYTES=y +CONFIG_LBLAW1=y +CONFIG_LBLAW1_BASE=0xE0600000 +CONFIG_LBLAW1_NAME="FPGA0" +CONFIG_LBLAW1_LENGTH_1_MBYTES=y CONFIG_CMD_IOLOOP=y CONFIG_FIT=y CONFIG_FIT_VERBOSE=y diff --git a/configs/hrcon_dh_defconfig b/configs/hrcon_dh_defconfig index c113543472..22689ef0ac 100644 --- a/configs/hrcon_dh_defconfig +++ b/configs/hrcon_dh_defconfig @@ -46,6 +46,14 @@ CONFIG_BAT3_BASE=0xE6000000 CONFIG_BAT3_ACCESS_RW=y CONFIG_BAT3_USER_MODE_VALID=y CONFIG_BAT3_SUPERVISOR_MODE_VALID=y +CONFIG_LBLAW0=y +CONFIG_LBLAW0_BASE=0xFE000000 +CONFIG_LBLAW0_NAME="FLASH" +CONFIG_LBLAW0_LENGTH_8_MBYTES=y +CONFIG_LBLAW1=y +CONFIG_LBLAW1_BASE=0xE0600000 +CONFIG_LBLAW1_NAME="FPGA0" +CONFIG_LBLAW1_LENGTH_1_MBYTES=y CONFIG_CMD_IOLOOP=y CONFIG_FIT=y CONFIG_FIT_VERBOSE=y diff --git a/configs/ids8313_defconfig b/configs/ids8313_defconfig index 4afed47033..168564606c 100644 --- a/configs/ids8313_defconfig +++ b/configs/ids8313_defconfig @@ -53,6 +53,23 @@ CONFIG_BAT6_ICACHE_GUARDED=y CONFIG_BAT6_DCACHE_GUARDED=y CONFIG_BAT6_USER_MODE_VALID=y CONFIG_BAT6_SUPERVISOR_MODE_VALID=y +CONFIG_NAND_LBLAWBAR_PRELIM_1=y +CONFIG_LBLAW0=y +CONFIG_LBLAW0_BASE=0xFF800000 +CONFIG_LBLAW0_NAME="FLASH" +CONFIG_LBLAW0_LENGTH_8_MBYTES=y +CONFIG_LBLAW1=y +CONFIG_LBLAW1_BASE=0xE1000000 +CONFIG_LBLAW1_NAME="NAND" +CONFIG_LBLAW1_LENGTH_32_KBYTES=y +CONFIG_LBLAW2=y +CONFIG_LBLAW2_BASE=0xE2000000 +CONFIG_LBLAW2_NAME="MRAM" +CONFIG_LBLAW2_LENGTH_128_KBYTES=y +CONFIG_LBLAW3=y +CONFIG_LBLAW3_BASE=0xE3000000 +CONFIG_LBLAW3_NAME="CPLD" +CONFIG_LBLAW3_LENGTH_32_KBYTES=y CONFIG_FIT=y CONFIG_FIT_SIGNATURE=y CONFIG_IMAGE_FORMAT_LEGACY=y diff --git a/configs/kmcoge5ne_defconfig b/configs/kmcoge5ne_defconfig index a358e28886..088dee63ba 100644 --- a/configs/kmcoge5ne_defconfig +++ b/configs/kmcoge5ne_defconfig @@ -92,6 +92,18 @@ CONFIG_BAT7_DCACHE_INHIBITED=y CONFIG_BAT7_DCACHE_GUARDED=y CONFIG_BAT7_USER_MODE_VALID=y CONFIG_BAT7_SUPERVISOR_MODE_VALID=y +CONFIG_LBLAW0=y +CONFIG_LBLAW0_BASE=0xF0000000 +CONFIG_LBLAW0_NAME="FLASH" +CONFIG_LBLAW0_LENGTH_256_MBYTES=y +CONFIG_LBLAW1=y +CONFIG_LBLAW1_BASE=0xE8000000 +CONFIG_LBLAW1_NAME="KMBEC_FPGA" +CONFIG_LBLAW1_LENGTH_128_MBYTES=y +CONFIG_LBLAW3=y +CONFIG_LBLAW3_BASE=0xA0000000 +CONFIG_LBLAW3_NAME="PAXE" +CONFIG_LBLAW3_LENGTH_512_MBYTES=y CONFIG_OF_BOARD_SETUP=y CONFIG_OF_STDOUT_VIA_ALIAS=y CONFIG_MISC_INIT_R=y diff --git a/configs/kmeter1_defconfig b/configs/kmeter1_defconfig index 10f7fdf110..64ea83fd12 100644 --- a/configs/kmeter1_defconfig +++ b/configs/kmeter1_defconfig @@ -65,6 +65,18 @@ CONFIG_BAT5_DCACHE_INHIBITED=y CONFIG_BAT5_DCACHE_GUARDED=y CONFIG_BAT5_USER_MODE_VALID=y CONFIG_BAT5_SUPERVISOR_MODE_VALID=y +CONFIG_LBLAW0=y +CONFIG_LBLAW0_BASE=0xF0000000 +CONFIG_LBLAW0_NAME="FLASH" +CONFIG_LBLAW0_LENGTH_256_MBYTES=y +CONFIG_LBLAW1=y +CONFIG_LBLAW1_BASE=0xE8000000 +CONFIG_LBLAW1_NAME="KMBEC_FPGA" +CONFIG_LBLAW1_LENGTH_128_MBYTES=y +CONFIG_LBLAW3=y +CONFIG_LBLAW3_BASE=0xA0000000 +CONFIG_LBLAW3_NAME="PAXE" +CONFIG_LBLAW3_LENGTH_512_MBYTES=y CONFIG_OF_BOARD_SETUP=y CONFIG_OF_STDOUT_VIA_ALIAS=y CONFIG_MISC_INIT_R=y diff --git a/configs/kmopti2_defconfig b/configs/kmopti2_defconfig index b32b39113f..3a88b6a027 100644 --- a/configs/kmopti2_defconfig +++ b/configs/kmopti2_defconfig @@ -76,6 +76,22 @@ CONFIG_BAT6_DCACHE_INHIBITED=y CONFIG_BAT6_DCACHE_GUARDED=y CONFIG_BAT6_USER_MODE_VALID=y CONFIG_BAT6_SUPERVISOR_MODE_VALID=y +CONFIG_LBLAW0=y +CONFIG_LBLAW0_BASE=0xF0000000 +CONFIG_LBLAW0_NAME="FLASH" +CONFIG_LBLAW0_LENGTH_256_MBYTES=y +CONFIG_LBLAW1=y +CONFIG_LBLAW1_BASE=0xE8000000 +CONFIG_LBLAW1_NAME="KMBEC_FPGA" +CONFIG_LBLAW1_LENGTH_128_MBYTES=y +CONFIG_LBLAW2=y +CONFIG_LBLAW2_BASE=0xA0000000 +CONFIG_LBLAW2_NAME="APP1" +CONFIG_LBLAW2_LENGTH_256_MBYTES=y +CONFIG_LBLAW3=y +CONFIG_LBLAW3_BASE=0xB0000000 +CONFIG_LBLAW3_NAME="APP2" +CONFIG_LBLAW3_LENGTH_256_MBYTES=y CONFIG_OF_BOARD_SETUP=y CONFIG_OF_STDOUT_VIA_ALIAS=y CONFIG_MISC_INIT_R=y diff --git a/configs/kmsupx5_defconfig b/configs/kmsupx5_defconfig index cc94d174f0..c818d7e4a1 100644 --- a/configs/kmsupx5_defconfig +++ b/configs/kmsupx5_defconfig @@ -66,6 +66,18 @@ CONFIG_BAT5_DCACHE_INHIBITED=y CONFIG_BAT5_DCACHE_GUARDED=y CONFIG_BAT5_USER_MODE_VALID=y CONFIG_BAT5_SUPERVISOR_MODE_VALID=y +CONFIG_LBLAW0=y +CONFIG_LBLAW0_BASE=0xF0000000 +CONFIG_LBLAW0_NAME="FLASH" +CONFIG_LBLAW0_LENGTH_256_MBYTES=y +CONFIG_LBLAW1=y +CONFIG_LBLAW1_BASE=0xE8000000 +CONFIG_LBLAW1_NAME="KMBEC_FPGA" +CONFIG_LBLAW1_LENGTH_128_MBYTES=y +CONFIG_LBLAW2=y +CONFIG_LBLAW2_BASE=0xA0000000 +CONFIG_LBLAW2_NAME="APP1" +CONFIG_LBLAW2_LENGTH_256_MBYTES=y CONFIG_OF_BOARD_SETUP=y CONFIG_OF_STDOUT_VIA_ALIAS=y CONFIG_MISC_INIT_R=y diff --git a/configs/kmtegr1_defconfig b/configs/kmtegr1_defconfig index 994e1525f7..640e0c7c3c 100644 --- a/configs/kmtegr1_defconfig +++ b/configs/kmtegr1_defconfig @@ -67,6 +67,18 @@ CONFIG_BAT6_DCACHE_INHIBITED=y CONFIG_BAT6_DCACHE_GUARDED=y CONFIG_BAT6_USER_MODE_VALID=y CONFIG_BAT6_SUPERVISOR_MODE_VALID=y +CONFIG_LBLAW0=y +CONFIG_LBLAW0_BASE=0xF0000000 +CONFIG_LBLAW0_NAME="FLASH" +CONFIG_LBLAW0_LENGTH_256_MBYTES=y +CONFIG_LBLAW1=y +CONFIG_LBLAW1_BASE=0xE8000000 +CONFIG_LBLAW1_NAME="KMBEC_FPGA" +CONFIG_LBLAW1_LENGTH_128_MBYTES=y +CONFIG_LBLAW3=y +CONFIG_LBLAW3_BASE=0xB0000000 +CONFIG_LBLAW3_NAME="APP2" +CONFIG_LBLAW3_LENGTH_256_MBYTES=y CONFIG_OF_BOARD_SETUP=y CONFIG_OF_STDOUT_VIA_ALIAS=y CONFIG_SYS_EXTRA_OPTIONS="KMTEGR1" diff --git a/configs/kmtepr2_defconfig b/configs/kmtepr2_defconfig index bb23786057..81579c6b02 100644 --- a/configs/kmtepr2_defconfig +++ b/configs/kmtepr2_defconfig @@ -76,6 +76,22 @@ CONFIG_BAT6_DCACHE_INHIBITED=y CONFIG_BAT6_DCACHE_GUARDED=y CONFIG_BAT6_USER_MODE_VALID=y CONFIG_BAT6_SUPERVISOR_MODE_VALID=y +CONFIG_LBLAW0=y +CONFIG_LBLAW0_BASE=0xF0000000 +CONFIG_LBLAW0_NAME="FLASH" +CONFIG_LBLAW0_LENGTH_256_MBYTES=y +CONFIG_LBLAW1=y +CONFIG_LBLAW1_BASE=0xE8000000 +CONFIG_LBLAW1_NAME="KMBEC_FPGA" +CONFIG_LBLAW1_LENGTH_128_MBYTES=y +CONFIG_LBLAW2=y +CONFIG_LBLAW2_BASE=0xA0000000 +CONFIG_LBLAW2_NAME="APP1" +CONFIG_LBLAW2_LENGTH_256_MBYTES=y +CONFIG_LBLAW3=y +CONFIG_LBLAW3_BASE=0xB0000000 +CONFIG_LBLAW3_NAME="APP2" +CONFIG_LBLAW3_LENGTH_256_MBYTES=y CONFIG_OF_BOARD_SETUP=y CONFIG_OF_STDOUT_VIA_ALIAS=y CONFIG_MISC_INIT_R=y diff --git a/configs/kmvect1_defconfig b/configs/kmvect1_defconfig index 666dbf32cc..709947b539 100644 --- a/configs/kmvect1_defconfig +++ b/configs/kmvect1_defconfig @@ -77,6 +77,22 @@ CONFIG_BAT6_DCACHE_INHIBITED=y CONFIG_BAT6_DCACHE_GUARDED=y CONFIG_BAT6_USER_MODE_VALID=y CONFIG_BAT6_SUPERVISOR_MODE_VALID=y +CONFIG_LBLAW0=y +CONFIG_LBLAW0_BASE=0xF0000000 +CONFIG_LBLAW0_NAME="FLASH" +CONFIG_LBLAW0_LENGTH_256_MBYTES=y +CONFIG_LBLAW1=y +CONFIG_LBLAW1_BASE=0xE8000000 +CONFIG_LBLAW1_NAME="KMBEC_FPGA" +CONFIG_LBLAW1_LENGTH_128_MBYTES=y +CONFIG_LBLAW2=y +CONFIG_LBLAW2_BASE=0xA0000000 +CONFIG_LBLAW2_NAME="APP1" +CONFIG_LBLAW2_LENGTH_256_MBYTES=y +CONFIG_LBLAW3=y +CONFIG_LBLAW3_BASE=0xB0000000 +CONFIG_LBLAW3_NAME="APP2" +CONFIG_LBLAW3_LENGTH_256_MBYTES=y CONFIG_OF_BOARD_SETUP=y CONFIG_OF_STDOUT_VIA_ALIAS=y CONFIG_SYS_EXTRA_OPTIONS="KMVECT1" diff --git a/configs/mpc8308_p1m_defconfig b/configs/mpc8308_p1m_defconfig index f583fa922e..b44e04e1ae 100644 --- a/configs/mpc8308_p1m_defconfig +++ b/configs/mpc8308_p1m_defconfig @@ -44,6 +44,18 @@ CONFIG_BAT3_BASE=0xE6000000 CONFIG_BAT3_ACCESS_RW=y CONFIG_BAT3_USER_MODE_VALID=y CONFIG_BAT3_SUPERVISOR_MODE_VALID=y +CONFIG_LBLAW0=y +CONFIG_LBLAW0_BASE=0xFC000000 +CONFIG_LBLAW0_NAME="FLASH" +CONFIG_LBLAW0_LENGTH_64_MBYTES=y +CONFIG_LBLAW1=y +CONFIG_LBLAW1_BASE=0xFBFF0000 +CONFIG_LBLAW1_NAME="SJA1000" +CONFIG_LBLAW1_LENGTH_32_KBYTES=y +CONFIG_LBLAW2=y +CONFIG_LBLAW2_BASE=0xFBFF8000 +CONFIG_LBLAW2_NAME="CPLD" +CONFIG_LBLAW2_LENGTH_32_KBYTES=y CONFIG_OF_BOARD_SETUP=y CONFIG_OF_STDOUT_VIA_ALIAS=y CONFIG_BOOTDELAY=5 diff --git a/configs/sbc8349_PCI_33_defconfig b/configs/sbc8349_PCI_33_defconfig index f8ce309376..6f407d56d5 100644 --- a/configs/sbc8349_PCI_33_defconfig +++ b/configs/sbc8349_PCI_33_defconfig @@ -65,6 +65,10 @@ CONFIG_BAT6_DCACHE_MEMORYCOHERENCE=y CONFIG_BAT6_DCACHE_GUARDED=y CONFIG_BAT6_USER_MODE_VALID=y CONFIG_BAT6_SUPERVISOR_MODE_VALID=y +CONFIG_LBLAW0=y +CONFIG_LBLAW0_BASE=0xFF800000 +CONFIG_LBLAW0_NAME="FLASH" +CONFIG_LBLAW0_LENGTH_8_MBYTES=y CONFIG_PCI_64BIT=y CONFIG_OF_BOARD_SETUP=y CONFIG_OF_STDOUT_VIA_ALIAS=y diff --git a/configs/sbc8349_PCI_66_defconfig b/configs/sbc8349_PCI_66_defconfig index bc9e228894..9c0b30f446 100644 --- a/configs/sbc8349_PCI_66_defconfig +++ b/configs/sbc8349_PCI_66_defconfig @@ -65,6 +65,10 @@ CONFIG_BAT6_DCACHE_MEMORYCOHERENCE=y CONFIG_BAT6_DCACHE_GUARDED=y CONFIG_BAT6_USER_MODE_VALID=y CONFIG_BAT6_SUPERVISOR_MODE_VALID=y +CONFIG_LBLAW0=y +CONFIG_LBLAW0_BASE=0xFF800000 +CONFIG_LBLAW0_NAME="FLASH" +CONFIG_LBLAW0_LENGTH_8_MBYTES=y CONFIG_PCI_64BIT=y CONFIG_OF_BOARD_SETUP=y CONFIG_OF_STDOUT_VIA_ALIAS=y diff --git a/configs/sbc8349_defconfig b/configs/sbc8349_defconfig index d8e60da7be..05361f76fc 100644 --- a/configs/sbc8349_defconfig +++ b/configs/sbc8349_defconfig @@ -45,6 +45,10 @@ CONFIG_BAT6_DCACHE_MEMORYCOHERENCE=y CONFIG_BAT6_DCACHE_GUARDED=y CONFIG_BAT6_USER_MODE_VALID=y CONFIG_BAT6_SUPERVISOR_MODE_VALID=y +CONFIG_LBLAW0=y +CONFIG_LBLAW0_BASE=0xFF800000 +CONFIG_LBLAW0_NAME="FLASH" +CONFIG_LBLAW0_LENGTH_8_MBYTES=y CONFIG_OF_BOARD_SETUP=y CONFIG_OF_STDOUT_VIA_ALIAS=y CONFIG_BOOTDELAY=6 diff --git a/configs/strider_con_defconfig b/configs/strider_con_defconfig index 508ffe201a..196c44470a 100644 --- a/configs/strider_con_defconfig +++ b/configs/strider_con_defconfig @@ -45,6 +45,14 @@ CONFIG_BAT3_BASE=0xE6000000 CONFIG_BAT3_ACCESS_RW=y CONFIG_BAT3_USER_MODE_VALID=y CONFIG_BAT3_SUPERVISOR_MODE_VALID=y +CONFIG_LBLAW0=y +CONFIG_LBLAW0_BASE=0xFE000000 +CONFIG_LBLAW0_NAME="FLASH" +CONFIG_LBLAW0_LENGTH_8_MBYTES=y +CONFIG_LBLAW1=y +CONFIG_LBLAW1_BASE=0xE0600000 +CONFIG_LBLAW1_NAME="FPGA0" +CONFIG_LBLAW1_LENGTH_1_MBYTES=y CONFIG_CMD_IOLOOP=y CONFIG_FIT=y CONFIG_FIT_VERBOSE=y diff --git a/configs/strider_con_dp_defconfig b/configs/strider_con_dp_defconfig index 514db1c213..c407bed189 100644 --- a/configs/strider_con_dp_defconfig +++ b/configs/strider_con_dp_defconfig @@ -45,6 +45,14 @@ CONFIG_BAT3_BASE=0xE6000000 CONFIG_BAT3_ACCESS_RW=y CONFIG_BAT3_USER_MODE_VALID=y CONFIG_BAT3_SUPERVISOR_MODE_VALID=y +CONFIG_LBLAW0=y +CONFIG_LBLAW0_BASE=0xFE000000 +CONFIG_LBLAW0_NAME="FLASH" +CONFIG_LBLAW0_LENGTH_8_MBYTES=y +CONFIG_LBLAW1=y +CONFIG_LBLAW1_BASE=0xE0600000 +CONFIG_LBLAW1_NAME="FPGA0" +CONFIG_LBLAW1_LENGTH_1_MBYTES=y CONFIG_CMD_IOLOOP=y CONFIG_FIT=y CONFIG_FIT_VERBOSE=y diff --git a/configs/strider_cpu_defconfig b/configs/strider_cpu_defconfig index a998585f3a..1128950ace 100644 --- a/configs/strider_cpu_defconfig +++ b/configs/strider_cpu_defconfig @@ -45,6 +45,14 @@ CONFIG_BAT3_BASE=0xE6000000 CONFIG_BAT3_ACCESS_RW=y CONFIG_BAT3_USER_MODE_VALID=y CONFIG_BAT3_SUPERVISOR_MODE_VALID=y +CONFIG_LBLAW0=y +CONFIG_LBLAW0_BASE=0xFE000000 +CONFIG_LBLAW0_NAME="FLASH" +CONFIG_LBLAW0_LENGTH_8_MBYTES=y +CONFIG_LBLAW1=y +CONFIG_LBLAW1_BASE=0xE0600000 +CONFIG_LBLAW1_NAME="FPGA0" +CONFIG_LBLAW1_LENGTH_1_MBYTES=y CONFIG_CMD_IOLOOP=y CONFIG_FIT=y CONFIG_FIT_VERBOSE=y diff --git a/configs/strider_cpu_dp_defconfig b/configs/strider_cpu_dp_defconfig index 48579c7563..f0b2c44efb 100644 --- a/configs/strider_cpu_dp_defconfig +++ b/configs/strider_cpu_dp_defconfig @@ -45,6 +45,14 @@ CONFIG_BAT3_BASE=0xE6000000 CONFIG_BAT3_ACCESS_RW=y CONFIG_BAT3_USER_MODE_VALID=y CONFIG_BAT3_SUPERVISOR_MODE_VALID=y +CONFIG_LBLAW0=y +CONFIG_LBLAW0_BASE=0xFE000000 +CONFIG_LBLAW0_NAME="FLASH" +CONFIG_LBLAW0_LENGTH_8_MBYTES=y +CONFIG_LBLAW1=y +CONFIG_LBLAW1_BASE=0xE0600000 +CONFIG_LBLAW1_NAME="FPGA0" +CONFIG_LBLAW1_LENGTH_1_MBYTES=y CONFIG_CMD_IOLOOP=y CONFIG_FIT=y CONFIG_FIT_VERBOSE=y diff --git a/configs/suvd3_defconfig b/configs/suvd3_defconfig index 4dd36cac91..10a32178f1 100644 --- a/configs/suvd3_defconfig +++ b/configs/suvd3_defconfig @@ -76,6 +76,22 @@ CONFIG_BAT6_DCACHE_INHIBITED=y CONFIG_BAT6_DCACHE_GUARDED=y CONFIG_BAT6_USER_MODE_VALID=y CONFIG_BAT6_SUPERVISOR_MODE_VALID=y +CONFIG_LBLAW0=y +CONFIG_LBLAW0_BASE=0xF0000000 +CONFIG_LBLAW0_NAME="FLASH" +CONFIG_LBLAW0_LENGTH_256_MBYTES=y +CONFIG_LBLAW1=y +CONFIG_LBLAW1_BASE=0xE8000000 +CONFIG_LBLAW1_NAME="KMBEC_FPGA" +CONFIG_LBLAW1_LENGTH_128_MBYTES=y +CONFIG_LBLAW2=y +CONFIG_LBLAW2_BASE=0xA0000000 +CONFIG_LBLAW2_NAME="APP1" +CONFIG_LBLAW2_LENGTH_256_MBYTES=y +CONFIG_LBLAW3=y +CONFIG_LBLAW3_BASE=0xB0000000 +CONFIG_LBLAW3_NAME="APP2" +CONFIG_LBLAW3_LENGTH_256_MBYTES=y CONFIG_OF_BOARD_SETUP=y CONFIG_OF_STDOUT_VIA_ALIAS=y CONFIG_SYS_EXTRA_OPTIONS="SUVD3" diff --git a/configs/tuge1_defconfig b/configs/tuge1_defconfig index 7db157bf21..6fada9bdf7 100644 --- a/configs/tuge1_defconfig +++ b/configs/tuge1_defconfig @@ -66,6 +66,18 @@ CONFIG_BAT5_DCACHE_INHIBITED=y CONFIG_BAT5_DCACHE_GUARDED=y CONFIG_BAT5_USER_MODE_VALID=y CONFIG_BAT5_SUPERVISOR_MODE_VALID=y +CONFIG_LBLAW0=y +CONFIG_LBLAW0_BASE=0xF0000000 +CONFIG_LBLAW0_NAME="FLASH" +CONFIG_LBLAW0_LENGTH_256_MBYTES=y +CONFIG_LBLAW1=y +CONFIG_LBLAW1_BASE=0xE8000000 +CONFIG_LBLAW1_NAME="KMBEC_FPGA" +CONFIG_LBLAW1_LENGTH_128_MBYTES=y +CONFIG_LBLAW2=y +CONFIG_LBLAW2_BASE=0xA0000000 +CONFIG_LBLAW2_NAME="APP1" +CONFIG_LBLAW2_LENGTH_256_MBYTES=y CONFIG_OF_BOARD_SETUP=y CONFIG_OF_STDOUT_VIA_ALIAS=y CONFIG_MISC_INIT_R=y diff --git a/configs/tuxx1_defconfig b/configs/tuxx1_defconfig index e0c1366291..1eb21e0e5a 100644 --- a/configs/tuxx1_defconfig +++ b/configs/tuxx1_defconfig @@ -76,6 +76,22 @@ CONFIG_BAT6_DCACHE_INHIBITED=y CONFIG_BAT6_DCACHE_GUARDED=y CONFIG_BAT6_USER_MODE_VALID=y CONFIG_BAT6_SUPERVISOR_MODE_VALID=y +CONFIG_LBLAW0=y +CONFIG_LBLAW0_BASE=0xF0000000 +CONFIG_LBLAW0_NAME="FLASH" +CONFIG_LBLAW0_LENGTH_256_MBYTES=y +CONFIG_LBLAW1=y +CONFIG_LBLAW1_BASE=0xE8000000 +CONFIG_LBLAW1_NAME="KMBEC_FPGA" +CONFIG_LBLAW1_LENGTH_128_MBYTES=y +CONFIG_LBLAW2=y +CONFIG_LBLAW2_BASE=0xA0000000 +CONFIG_LBLAW2_NAME="APP1" +CONFIG_LBLAW2_LENGTH_256_MBYTES=y +CONFIG_LBLAW3=y +CONFIG_LBLAW3_BASE=0xB0000000 +CONFIG_LBLAW3_NAME="APP2" +CONFIG_LBLAW3_LENGTH_256_MBYTES=y CONFIG_OF_BOARD_SETUP=y CONFIG_OF_STDOUT_VIA_ALIAS=y CONFIG_MISC_INIT_R=y diff --git a/configs/ve8313_defconfig b/configs/ve8313_defconfig index 517c4aa854..1df5195e97 100644 --- a/configs/ve8313_defconfig +++ b/configs/ve8313_defconfig @@ -65,6 +65,15 @@ CONFIG_BAT7_ICACHE_GUARDED=y CONFIG_BAT7_DCACHE_GUARDED=y CONFIG_BAT7_USER_MODE_VALID=y CONFIG_BAT7_SUPERVISOR_MODE_VALID=y +CONFIG_NAND_LBLAWBAR_PRELIM_1=y +CONFIG_LBLAW0=y +CONFIG_LBLAW0_BASE=0xFE000000 +CONFIG_LBLAW0_NAME="FLASH" +CONFIG_LBLAW0_LENGTH_32_MBYTES=y +CONFIG_LBLAW1=y +CONFIG_LBLAW1_BASE=0x61000000 +CONFIG_LBLAW1_NAME="NAND" +CONFIG_LBLAW1_LENGTH_32_KBYTES=y CONFIG_OF_BOARD_SETUP=y CONFIG_OF_STDOUT_VIA_ALIAS=y CONFIG_BOOTDELAY=6 diff --git a/configs/vme8349_defconfig b/configs/vme8349_defconfig index b7cf6a44bc..9336dfac5c 100644 --- a/configs/vme8349_defconfig +++ b/configs/vme8349_defconfig @@ -63,6 +63,14 @@ CONFIG_BAT6_ICACHE_MEMORYCOHERENCE=y CONFIG_BAT6_DCACHE_MEMORYCOHERENCE=y CONFIG_BAT6_USER_MODE_VALID=y CONFIG_BAT6_SUPERVISOR_MODE_VALID=y +CONFIG_LBLAW0=y +CONFIG_LBLAW0_BASE=0xF8000000 +CONFIG_LBLAW0_NAME="FLASH" +CONFIG_LBLAW0_LENGTH_128_MBYTES=y +CONFIG_LBLAW1=y +CONFIG_LBLAW1_BASE=0xF0000000 +CONFIG_LBLAW1_NAME="WINDOW1" +CONFIG_LBLAW1_LENGTH_256_KBYTES=y CONFIG_PCI_64BIT=y CONFIG_OF_BOARD_SETUP=y CONFIG_OF_STDOUT_VIA_ALIAS=y diff --git a/include/configs/MPC8308RDB.h b/include/configs/MPC8308RDB.h index dc7a8b8aa8..1953d18e87 100644 --- a/include/configs/MPC8308RDB.h +++ b/include/configs/MPC8308RDB.h @@ -176,9 +176,6 @@ #define CONFIG_SYS_FLASH_SIZE 8 /* FLASH size is 8M */ /* Window base at flash base */ -#define CONFIG_SYS_LBLAWBAR0_PRELIM CONFIG_SYS_FLASH_BASE -#define CONFIG_SYS_LBLAWAR0_PRELIM (LBLAWAR_EN | LBLAWAR_8MB) - #define CONFIG_SYS_BR0_PRELIM (CONFIG_SYS_FLASH_BASE \ | BR_PS_16 /* 16 bit port */ \ | BR_MS_GPCM /* MSEL = GPCM */ \ @@ -218,9 +215,6 @@ | OR_FCM_EHTR) /* 0xFFFF8396 */ -#define CONFIG_SYS_LBLAWBAR1_PRELIM CONFIG_SYS_NAND_BASE -#define CONFIG_SYS_LBLAWAR1_PRELIM (LBLAWAR_EN | LBLAWAR_32KB) - #ifdef CONFIG_VSC7385_ENET #define CONFIG_TSEC2 /* VSC7385 Base address on CS2 */ @@ -239,10 +233,6 @@ | OR_GPCM_TRLX_SET \ | OR_GPCM_EHTR_SET) /* 0xFFFE09FF */ -/* Access window base at VSC7385 base */ -#define CONFIG_SYS_LBLAWBAR2_PRELIM CONFIG_SYS_VSC7385_BASE -/* Access window size 128K */ -#define CONFIG_SYS_LBLAWAR2_PRELIM (LBLAWAR_EN | LBLAWAR_128KB) /* The flash address and size of the VSC7385 firmware image */ #define CONFIG_VSC7385_IMAGE 0xFE7FE000 #define CONFIG_VSC7385_IMAGE_SIZE 8192 diff --git a/include/configs/MPC8313ERDB_NAND.h b/include/configs/MPC8313ERDB_NAND.h index 596d39ee5e..79c7f12bae 100644 --- a/include/configs/MPC8313ERDB_NAND.h +++ b/include/configs/MPC8313ERDB_NAND.h @@ -180,10 +180,6 @@ | OR_GPCM_EHTR \ | OR_GPCM_EAD) /* 0xFF006FF7 TODO SLOW 16 MB flash size */ - /* window base at flash base */ -#define CONFIG_SYS_LBLAWBAR0_PRELIM CONFIG_SYS_FLASH_BASE - /* 16 MB window size */ -#define CONFIG_SYS_LBLAWAR0_PRELIM (LBLAWAR_EN | LBLAWAR_16MB) #define CONFIG_SYS_MAX_FLASH_BANKS 1 /* number of banks */ #define CONFIG_SYS_MAX_FLASH_SECT 135 /* sectors per device */ @@ -253,12 +249,6 @@ #define CONFIG_SYS_NAND_BR_PRELIM CONFIG_SYS_BR0_PRELIM #define CONFIG_SYS_NAND_OR_PRELIM CONFIG_SYS_OR0_PRELIM -#define CONFIG_SYS_LBLAWBAR1_PRELIM CONFIG_SYS_NAND_BASE -#define CONFIG_SYS_LBLAWAR1_PRELIM (LBLAWAR_EN | LBLAWAR_32KB) - -#define CONFIG_SYS_NAND_LBLAWBAR_PRELIM CONFIG_SYS_LBLAWBAR1_PRELIM -#define CONFIG_SYS_NAND_LBLAWAR_PRELIM CONFIG_SYS_LBLAWAR1_PRELIM - /* local bus write LED / read status buffer (BCSR) mapping */ #define CONFIG_SYS_BCSR_ADDR 0xFA000000 #define CONFIG_SYS_BCSR_SIZE (32 * 1024) /* 0x00008000 */ @@ -277,9 +267,6 @@ | OR_GPCM_EHTR_SET \ | OR_GPCM_EAD) /* 0xFFFF8FF7 */ -#define CONFIG_SYS_LBLAWBAR3_PRELIM CONFIG_SYS_BCSR_ADDR -#define CONFIG_SYS_LBLAWAR3_PRELIM (LBLAWAR_EN | LBLAWAR_32KB) - /* Vitesse 7385 */ #ifdef CONFIG_VSC7385_ENET @@ -301,11 +288,6 @@ | OR_GPCM_EHTR_SET \ | OR_GPCM_EAD) /* 0xFFFE09FF */ - - /* Access window base at VSC7385 base */ -#define CONFIG_SYS_LBLAWBAR2_PRELIM CONFIG_SYS_VSC7385_BASE -#define CONFIG_SYS_LBLAWAR2_PRELIM (LBLAWAR_EN | LBLAWAR_128KB) - #endif #define CONFIG_MPC83XX_GPIO 1 diff --git a/include/configs/MPC8313ERDB_NOR.h b/include/configs/MPC8313ERDB_NOR.h index 9d1ce200ec..1b2bba96d3 100644 --- a/include/configs/MPC8313ERDB_NOR.h +++ b/include/configs/MPC8313ERDB_NOR.h @@ -153,10 +153,6 @@ | OR_GPCM_EHTR \ | OR_GPCM_EAD) /* 0xFF006FF7 TODO SLOW 16 MB flash size */ - /* window base at flash base */ -#define CONFIG_SYS_LBLAWBAR0_PRELIM CONFIG_SYS_FLASH_BASE - /* 16 MB window size */ -#define CONFIG_SYS_LBLAWAR0_PRELIM (LBLAWAR_EN | LBLAWAR_16MB) #define CONFIG_SYS_MAX_FLASH_BANKS 1 /* number of banks */ #define CONFIG_SYS_MAX_FLASH_SECT 135 /* sectors per device */ @@ -222,12 +218,6 @@ #define CONFIG_SYS_NAND_BR_PRELIM CONFIG_SYS_BR1_PRELIM #define CONFIG_SYS_NAND_OR_PRELIM CONFIG_SYS_OR1_PRELIM -#define CONFIG_SYS_LBLAWBAR1_PRELIM CONFIG_SYS_NAND_BASE -#define CONFIG_SYS_LBLAWAR1_PRELIM (LBLAWAR_EN | LBLAWAR_32KB) - -#define CONFIG_SYS_NAND_LBLAWBAR_PRELIM CONFIG_SYS_LBLAWBAR1_PRELIM -#define CONFIG_SYS_NAND_LBLAWAR_PRELIM CONFIG_SYS_LBLAWAR1_PRELIM - /* local bus write LED / read status buffer (BCSR) mapping */ #define CONFIG_SYS_BCSR_ADDR 0xFA000000 #define CONFIG_SYS_BCSR_SIZE (32 * 1024) /* 0x00008000 */ @@ -246,9 +236,6 @@ | OR_GPCM_EHTR_SET \ | OR_GPCM_EAD) /* 0xFFFF8FF7 */ -#define CONFIG_SYS_LBLAWBAR3_PRELIM CONFIG_SYS_BCSR_ADDR -#define CONFIG_SYS_LBLAWAR3_PRELIM (LBLAWAR_EN | LBLAWAR_32KB) - /* Vitesse 7385 */ #ifdef CONFIG_VSC7385_ENET @@ -270,11 +257,6 @@ | OR_GPCM_EHTR_SET \ | OR_GPCM_EAD) /* 0xFFFE09FF */ - - /* Access window base at VSC7385 base */ -#define CONFIG_SYS_LBLAWBAR2_PRELIM CONFIG_SYS_VSC7385_BASE -#define CONFIG_SYS_LBLAWAR2_PRELIM (LBLAWAR_EN | LBLAWAR_128KB) - #endif #define CONFIG_MPC83XX_GPIO 1 diff --git a/include/configs/MPC8315ERDB.h b/include/configs/MPC8315ERDB.h index fb568efe2d..86491b41d6 100644 --- a/include/configs/MPC8315ERDB.h +++ b/include/configs/MPC8315ERDB.h @@ -146,10 +146,6 @@ #define CONFIG_SYS_FLASH_BASE 0xFE000000 /* FLASH base address */ #define CONFIG_SYS_FLASH_SIZE 8 /* FLASH size is 8M */ - /* Window base at flash base */ -#define CONFIG_SYS_LBLAWBAR0_PRELIM CONFIG_SYS_FLASH_BASE -#define CONFIG_SYS_LBLAWAR0_PRELIM (LBLAWAR_EN | LBLAWAR_8MB) - #define CONFIG_SYS_MAX_FLASH_BANKS 1 /* number of banks */ /* 127 64KB sectors and 8 8KB top sectors per device */ #define CONFIG_SYS_MAX_FLASH_SECT 135 @@ -213,12 +209,6 @@ #define CONFIG_SYS_NAND_BR_PRELIM CONFIG_SYS_BR1_PRELIM #define CONFIG_SYS_NAND_OR_PRELIM CONFIG_SYS_OR1_PRELIM -#define CONFIG_SYS_LBLAWBAR1_PRELIM CONFIG_SYS_NAND_BASE -#define CONFIG_SYS_LBLAWAR1_PRELIM (LBLAWAR_EN | LBLAWAR_32KB) - -#define CONFIG_SYS_NAND_LBLAWBAR_PRELIM CONFIG_SYS_LBLAWBAR1_PRELIM -#define CONFIG_SYS_NAND_LBLAWAR_PRELIM CONFIG_SYS_LBLAWAR1_PRELIM - #if CONFIG_SYS_MONITOR_BASE < CONFIG_SYS_FLASH_BASE && \ !defined(CONFIG_NAND_SPL) #define CONFIG_SYS_RAMBOOT diff --git a/include/configs/MPC8323ERDB.h b/include/configs/MPC8323ERDB.h index 489e7c3368..cb17c7644d 100644 --- a/include/configs/MPC8323ERDB.h +++ b/include/configs/MPC8323ERDB.h @@ -141,9 +141,6 @@ #define CONFIG_SYS_FLASH_BASE 0xFE000000 /* FLASH base address */ #define CONFIG_SYS_FLASH_SIZE 16 /* FLASH size is 16M */ - /* Window base at flash base */ -#define CONFIG_SYS_LBLAWBAR0_PRELIM CONFIG_SYS_FLASH_BASE -#define CONFIG_SYS_LBLAWAR0_PRELIM (LBLAWAR_EN | LBLAWAR_32MB) #define CONFIG_SYS_BR0_PRELIM (CONFIG_SYS_FLASH_BASE \ | BR_PS_16 /* 16 bit port */ \ diff --git a/include/configs/MPC832XEMDS.h b/include/configs/MPC832XEMDS.h index 15fca456cc..d51d5ce06d 100644 --- a/include/configs/MPC832XEMDS.h +++ b/include/configs/MPC832XEMDS.h @@ -133,10 +133,6 @@ #define CONFIG_SYS_FLASH_BASE 0xFE000000 /* FLASH base address */ #define CONFIG_SYS_FLASH_SIZE 16 /* FLASH size is 16M */ - /* Window base at flash base */ -#define CONFIG_SYS_LBLAWBAR0_PRELIM CONFIG_SYS_FLASH_BASE -#define CONFIG_SYS_LBLAWAR0_PRELIM (LBLAWAR_EN | LBLAWAR_32MB) - #define CONFIG_SYS_BR0_PRELIM (CONFIG_SYS_FLASH_BASE \ | BR_PS_16 /* 16 bit port */ \ | BR_MS_GPCM /* MSEL = GPCM */ \ @@ -162,8 +158,6 @@ */ #define CONFIG_SYS_BCSR 0xF8000000 /* Access window base at BCSR base */ -#define CONFIG_SYS_LBLAWBAR1_PRELIM CONFIG_SYS_BCSR -#define CONFIG_SYS_LBLAWAR1_PRELIM (LBLAWAR_EN | LBLAWAR_32KB) #define CONFIG_SYS_BR1_PRELIM (CONFIG_SYS_BCSR \ | BR_PS_8 \ @@ -185,8 +179,6 @@ /* PIB window base 0xF8008000 */ #define CONFIG_SYS_PIB_BASE 0xF8008000 #define CONFIG_SYS_PIB_WINDOW_SIZE (32 * 1024) -#define CONFIG_SYS_LBLAWBAR3_PRELIM CONFIG_SYS_PIB_BASE -#define CONFIG_SYS_LBLAWAR3_PRELIM (LBLAWAR_EN | LBLAWAR_64KB) /* * CS2 on Local Bus, to PIB diff --git a/include/configs/MPC8349EMDS.h b/include/configs/MPC8349EMDS.h index e4d90589e9..06017a81bc 100644 --- a/include/configs/MPC8349EMDS.h +++ b/include/configs/MPC8349EMDS.h @@ -137,10 +137,6 @@ | OR_GPCM_EHTR_SET \ | OR_GPCM_EAD) - /* window base at flash base */ -#define CONFIG_SYS_LBLAWBAR0_PRELIM CONFIG_SYS_FLASH_BASE -#define CONFIG_SYS_LBLAWAR0_PRELIM (LBLAWAR_EN | LBLAWAR_32MB) - #define CONFIG_SYS_MAX_FLASH_BANKS 1 /* number of banks */ #define CONFIG_SYS_MAX_FLASH_SECT 256 /* max sectors per device */ @@ -161,8 +157,6 @@ */ #define CONFIG_SYS_BCSR 0xE2400000 /* Access window base at BCSR base */ -#define CONFIG_SYS_LBLAWBAR1_PRELIM CONFIG_SYS_BCSR -#define CONFIG_SYS_LBLAWAR1_PRELIM (LBLAWAR_EN | LBLAWAR_32KB) #define CONFIG_SYS_BR1_PRELIM (CONFIG_SYS_BCSR \ | BR_PS_8 \ | BR_MS_GPCM \ diff --git a/include/configs/MPC8349EMDS_SDRAM.h b/include/configs/MPC8349EMDS_SDRAM.h index a24a2011d2..708a21f164 100644 --- a/include/configs/MPC8349EMDS_SDRAM.h +++ b/include/configs/MPC8349EMDS_SDRAM.h @@ -137,10 +137,6 @@ | OR_GPCM_EHTR_SET \ | OR_GPCM_EAD) - /* window base at flash base */ -#define CONFIG_SYS_LBLAWBAR0_PRELIM CONFIG_SYS_FLASH_BASE -#define CONFIG_SYS_LBLAWAR0_PRELIM (LBLAWAR_EN | LBLAWAR_32MB) - #define CONFIG_SYS_MAX_FLASH_BANKS 1 /* number of banks */ #define CONFIG_SYS_MAX_FLASH_SECT 256 /* max sectors per device */ @@ -161,8 +157,6 @@ */ #define CONFIG_SYS_BCSR 0xE2400000 /* Access window base at BCSR base */ -#define CONFIG_SYS_LBLAWBAR1_PRELIM CONFIG_SYS_BCSR -#define CONFIG_SYS_LBLAWAR1_PRELIM (LBLAWAR_EN | LBLAWAR_32KB) #define CONFIG_SYS_BR1_PRELIM (CONFIG_SYS_BCSR \ | BR_PS_8 \ | BR_MS_GPCM \ @@ -222,8 +216,6 @@ | BR_MS_SDRAM /* MSEL = SDRAM */ \ | BR_V) /* Valid */ /* 0xF0001861 */ -#define CONFIG_SYS_LBLAWBAR2_PRELIM CONFIG_SYS_LBC_SDRAM_BASE -#define CONFIG_SYS_LBLAWAR2_PRELIM (LBLAWAR_EN | LBLAWAR_64MB) /* * The SDRAM size in MB, CONFIG_SYS_LBC_SDRAM_SIZE, is 64. diff --git a/include/configs/MPC8349ITX.h b/include/configs/MPC8349ITX.h index aeee6e0408..16d615dcc6 100644 --- a/include/configs/MPC8349ITX.h +++ b/include/configs/MPC8349ITX.h @@ -226,9 +226,6 @@ boards, we say we have two, but don't display a message if we find only one. */ | OR_GPCM_TRLX_SET \ | OR_GPCM_EHTR_SET \ | OR_GPCM_EAD) -#define CONFIG_SYS_LBLAWBAR0_PRELIM CONFIG_SYS_FLASH_BASE -#define CONFIG_SYS_LBLAWAR0_PRELIM (LBLAWAR_EN | LBLAWAR_16MB) - /* Vitesse 7385 */ #define CONFIG_SYS_VSC7385_BASE 0xF8000000 @@ -247,10 +244,6 @@ boards, we say we have two, but don't display a message if we find only one. */ | OR_GPCM_TRLX_SET \ | OR_GPCM_EHTR_SET \ | OR_GPCM_EAD) - -#define CONFIG_SYS_LBLAWBAR1_PRELIM CONFIG_SYS_VSC7385_BASE -#define CONFIG_SYS_LBLAWAR1_PRELIM (LBLAWAR_EN | LBLAWAR_128KB) - #endif /* LED */ @@ -281,9 +274,6 @@ boards, we say we have two, but don't display a message if we find only one. */ | BR_V) #define CONFIG_SYS_OR3_PRELIM (OR_UPM_AM | OR_UPM_BI) -#define CONFIG_SYS_LBLAWBAR3_PRELIM CONFIG_SYS_CF_BASE -#define CONFIG_SYS_LBLAWAR3_PRELIM (LBLAWAR_EN | LBLAWAR_64KB) - #endif /* diff --git a/include/configs/MPC837XEMDS.h b/include/configs/MPC837XEMDS.h index 01a3a77e99..9d6dc767ef 100644 --- a/include/configs/MPC837XEMDS.h +++ b/include/configs/MPC837XEMDS.h @@ -162,10 +162,6 @@ #define CONFIG_SYS_FLASH_BASE 0xFE000000 /* FLASH base address */ #define CONFIG_SYS_FLASH_SIZE 32 /* max FLASH size is 32M */ - /* Window base at flash base */ -#define CONFIG_SYS_LBLAWBAR0_PRELIM CONFIG_SYS_FLASH_BASE -#define CONFIG_SYS_LBLAWAR0_PRELIM (LBLAWAR_EN | LBLAWAR_32MB) - #define CONFIG_SYS_BR0_PRELIM (CONFIG_SYS_FLASH_BASE \ | BR_PS_16 /* 16 bit port */ \ | BR_MS_GPCM /* MSEL = GPCM */ \ @@ -193,9 +189,6 @@ */ #define CONFIG_SYS_BCSR 0xF8000000 /* Access window base at BCSR base */ -#define CONFIG_SYS_LBLAWBAR1_PRELIM CONFIG_SYS_BCSR -#define CONFIG_SYS_LBLAWAR1_PRELIM (LBLAWAR_EN | LBLAWAR_32KB) - #define CONFIG_SYS_BR1_PRELIM (CONFIG_SYS_BCSR \ | BR_PS_8 \ | BR_MS_GPCM \ @@ -233,9 +226,6 @@ | OR_FCM_EHTR) /* 0xFFFF919E */ -#define CONFIG_SYS_LBLAWBAR3_PRELIM CONFIG_SYS_NAND_BASE -#define CONFIG_SYS_LBLAWAR3_PRELIM (LBLAWAR_EN | LBLAWAR_32KB) - /* * Serial Port */ diff --git a/include/configs/MPC837XERDB.h b/include/configs/MPC837XERDB.h index 9a4eeb6390..a1de8acc5c 100644 --- a/include/configs/MPC837XERDB.h +++ b/include/configs/MPC837XERDB.h @@ -188,10 +188,6 @@ #define CONFIG_SYS_FLASH_EMPTY_INFO /* display empty sectors */ - /* Window base at flash base */ -#define CONFIG_SYS_LBLAWBAR0_PRELIM CONFIG_SYS_FLASH_BASE -#define CONFIG_SYS_LBLAWAR0_PRELIM 0x80000016 /* 8 MB window size */ - #define CONFIG_SYS_BR0_PRELIM (CONFIG_SYS_FLASH_BASE \ | BR_PS_16 /* 16 bit port */ \ | BR_MS_GPCM /* MSEL = GPCM */ \ @@ -226,9 +222,6 @@ | OR_FCM_SCY_1 \ | OR_FCM_TRLX \ | OR_FCM_EHTR) -#define CONFIG_SYS_LBLAWBAR1_PRELIM CONFIG_SYS_NAND_BASE -#define CONFIG_SYS_LBLAWAR1_PRELIM (LBLAWAR_EN | LBLAWAR_32KB) - /* Vitesse 7385 */ #define CONFIG_SYS_VSC7385_BASE 0xF0000000 @@ -249,11 +242,6 @@ | OR_GPCM_EHTR_SET \ | OR_GPCM_EAD) /* 0xfffe09ff */ - - /* Access Base */ -#define CONFIG_SYS_LBLAWBAR2_PRELIM CONFIG_SYS_VSC7385_BASE -#define CONFIG_SYS_LBLAWAR2_PRELIM (LBLAWAR_EN | LBLAWAR_128KB) - #endif /* diff --git a/include/configs/TQM834x.h b/include/configs/TQM834x.h index c5a6203001..4479000d25 100644 --- a/include/configs/TQM834x.h +++ b/include/configs/TQM834x.h @@ -93,26 +93,15 @@ #define CONFIG_SYS_OR0_PRELIM (CONFIG_SYS_PRELIM_OR_AM \ | CONFIG_SYS_OR_TIMING_FLASH) -#define CONFIG_SYS_LBLAWAR0_PRELIM (LBLAWAR_EN | LBLAWAR_1GB) - - /* Window base at flash base */ -#define CONFIG_SYS_LBLAWBAR0_PRELIM CONFIG_SYS_FLASH_BASE - /* disable remaining mappings */ #define CONFIG_SYS_BR1_PRELIM 0x00000000 #define CONFIG_SYS_OR1_PRELIM 0x00000000 -#define CONFIG_SYS_LBLAWBAR1_PRELIM 0x00000000 -#define CONFIG_SYS_LBLAWAR1_PRELIM 0x00000000 #define CONFIG_SYS_BR2_PRELIM 0x00000000 #define CONFIG_SYS_OR2_PRELIM 0x00000000 -#define CONFIG_SYS_LBLAWBAR2_PRELIM 0x00000000 -#define CONFIG_SYS_LBLAWAR2_PRELIM 0x00000000 #define CONFIG_SYS_BR3_PRELIM 0x00000000 #define CONFIG_SYS_OR3_PRELIM 0x00000000 -#define CONFIG_SYS_LBLAWBAR3_PRELIM 0x00000000 -#define CONFIG_SYS_LBLAWAR3_PRELIM 0x00000000 /* * Monitor config diff --git a/include/configs/caddy2.h b/include/configs/caddy2.h index f4ee222808..b355e56355 100644 --- a/include/configs/caddy2.h +++ b/include/configs/caddy2.h @@ -84,8 +84,6 @@ | OR_GPCM_EHTR_SET \ | OR_GPCM_EAD) /* 0xffc06ff7 */ -#define CONFIG_SYS_LBLAWBAR0_PRELIM CONFIG_SYS_FLASH_BASE -#define CONFIG_SYS_LBLAWAR0_PRELIM (LBLAWAR_EN | LBLAWAR_4MB) #define CONFIG_SYS_WINDOW1_BASE 0xf0000000 #define CONFIG_SYS_BR1_PRELIM (CONFIG_SYS_WINDOW1_BASE \ @@ -96,8 +94,6 @@ #define CONFIG_SYS_OR1_PRELIM (OR_AM_256KB \ | OR_GPCM_SETA) /* 0xfffc0208 */ -#define CONFIG_SYS_LBLAWBAR1_PRELIM CONFIG_SYS_WINDOW1_BASE -#define CONFIG_SYS_LBLAWAR1_PRELIM (LBLAWAR_EN | LBLAWAR_256KB) #define CONFIG_SYS_MAX_FLASH_BANKS 1 /* number of banks */ #define CONFIG_SYS_MAX_FLASH_SECT 1024 /* sectors per device*/ diff --git a/include/configs/hrcon.h b/include/configs/hrcon.h index c8fabf9da5..d86de800db 100644 --- a/include/configs/hrcon.h +++ b/include/configs/hrcon.h @@ -170,9 +170,6 @@ #define CONFIG_SYS_FLASH_SIZE 8 /* FLASH size is up to 8M */ /* Window base at flash base */ -#define CONFIG_SYS_LBLAWBAR0_PRELIM CONFIG_SYS_FLASH_BASE -#define CONFIG_SYS_LBLAWAR0_PRELIM (LBLAWAR_EN | LBLAWAR_8MB) - #define CONFIG_SYS_BR0_PRELIM (CONFIG_SYS_FLASH_BASE \ | BR_PS_16 /* 16 bit port */ \ | BR_MS_GPCM /* MSEL = GPCM */ \ @@ -199,9 +196,6 @@ #define CONFIG_SYS_FPGA0_SIZE 1 /* FPGA size is 1M */ /* Window base at FPGA base */ -#define CONFIG_SYS_LBLAWBAR1_PRELIM CONFIG_SYS_FPGA0_BASE -#define CONFIG_SYS_LBLAWAR1_PRELIM (LBLAWAR_EN | LBLAWAR_1MB) - #define CONFIG_SYS_BR1_PRELIM (CONFIG_SYS_FPGA0_BASE \ | BR_PS_16 /* 16 bit port */ \ | BR_MS_GPCM /* MSEL = GPCM */ \ diff --git a/include/configs/ids8313.h b/include/configs/ids8313.h index 120eb0a6b7..e930c65637 100644 --- a/include/configs/ids8313.h +++ b/include/configs/ids8313.h @@ -142,9 +142,6 @@ #define CONFIG_SYS_FLASH_BASE 0xFF800000 #define CONFIG_SYS_FLASH_SIZE 8 -#define CONFIG_SYS_LBLAWBAR0_PRELIM CONFIG_SYS_FLASH_BASE -#define CONFIG_SYS_LBLAWAR0_PRELIM 0x80000016 - #define CONFIG_SYS_BR0_PRELIM (CONFIG_SYS_FLASH_BASE |\ BR_PS_8 |\ BR_MS_GPCM |\ @@ -173,11 +170,6 @@ #define CONFIG_SYS_NAND_BLOCK_SIZE (128 << 10) #define NAND_CACHE_PAGES 64 -#define CONFIG_SYS_LBLAWBAR1_PRELIM CONFIG_SYS_NAND_BASE -#define CONFIG_SYS_LBLAWAR1_PRELIM 0x8000000E -#define CONFIG_SYS_NAND_LBLAWBAR_PRELIM CONFIG_SYS_LBLAWBAR1_PRELIM -#define CONFIG_SYS_NAND_LBLAWAR_PRELIM CONFIG_SYS_LBLAWAR1_PRELIM - #define CONFIG_SYS_BR1_PRELIM ((CONFIG_SYS_NAND_BASE) |\ (2<<BR_DECC_SHIFT) |\ BR_PS_8 |\ @@ -199,8 +191,6 @@ */ #define CONFIG_SYS_MRAM_BASE 0xE2000000 #define CONFIG_SYS_MRAM_SIZE 0x20000 /* 128 Kb */ -#define CONFIG_SYS_LBLAWBAR2_PRELIM CONFIG_SYS_MRAM_BASE -#define CONFIG_SYS_LBLAWAR2_PRELIM 0x80000010 /* 128 Kb */ #define CONFIG_SYS_OR_TIMING_MRAM @@ -216,8 +206,6 @@ */ #define CONFIG_SYS_CPLD_BASE 0xE3000000 #define CONFIG_SYS_CPLD_SIZE 0x8000 -#define CONFIG_SYS_LBLAWBAR3_PRELIM CONFIG_SYS_CPLD_BASE -#define CONFIG_SYS_LBLAWAR3_PRELIM 0x8000000E #define CONFIG_SYS_OR_TIMING_MRAM diff --git a/include/configs/kmcoge5ne.h b/include/configs/kmcoge5ne.h index a4a0fb222b..dcabac5666 100644 --- a/include/configs/kmcoge5ne.h +++ b/include/configs/kmcoge5ne.h @@ -108,9 +108,6 @@ */ #define CONFIG_SYS_FLASH_SIZE 256 /* max FLASH size is 256M */ -#define CONFIG_SYS_LBLAWBAR0_PRELIM CONFIG_SYS_FLASH_BASE -#define CONFIG_SYS_LBLAWAR0_PRELIM (LBLAWAR_EN | LBLAWAR_256MB) - #define CONFIG_SYS_BR0_PRELIM (CONFIG_SYS_FLASH_BASE | \ BR_PS_16 | /* 16 bit port size */ \ BR_MS_GPCM | /* MSEL = GPCM */ \ @@ -129,9 +126,6 @@ * PRIO1/PIGGY on the local bus CS1 */ /* Window base at flash base */ -#define CONFIG_SYS_LBLAWBAR1_PRELIM CONFIG_SYS_KMBEC_FPGA_BASE -#define CONFIG_SYS_LBLAWAR1_PRELIM (LBLAWAR_EN | LBLAWAR_128MB) - #define CONFIG_SYS_BR1_PRELIM (CONFIG_SYS_KMBEC_FPGA_BASE | \ BR_PS_8 | /* 8 bit port size */ \ BR_MS_GPCM | /* MSEL = GPCM */ \ @@ -353,10 +347,6 @@ #define CONFIG_SYS_PAXE_BASE 0xA0000000 #define CONFIG_SYS_PAXE_SIZE 256 -#define CONFIG_SYS_LBLAWBAR3_PRELIM CONFIG_SYS_PAXE_BASE - -#define CONFIG_SYS_LBLAWAR3_PRELIM 0x8000001C /* 512MB window size */ - #define CONFIG_SYS_BR3_PRELIM (\ CONFIG_SYS_PAXE_BASE | \ (1 << BR_PS_SHIFT) | \ diff --git a/include/configs/kmeter1.h b/include/configs/kmeter1.h index f6c7cfce43..1da8df3931 100644 --- a/include/configs/kmeter1.h +++ b/include/configs/kmeter1.h @@ -93,9 +93,6 @@ */ #define CONFIG_SYS_FLASH_SIZE 256 /* max FLASH size is 256M */ -#define CONFIG_SYS_LBLAWBAR0_PRELIM CONFIG_SYS_FLASH_BASE -#define CONFIG_SYS_LBLAWAR0_PRELIM (LBLAWAR_EN | LBLAWAR_256MB) - #define CONFIG_SYS_BR0_PRELIM (CONFIG_SYS_FLASH_BASE | \ BR_PS_16 | /* 16 bit port size */ \ BR_MS_GPCM | /* MSEL = GPCM */ \ @@ -114,9 +111,6 @@ * PRIO1/PIGGY on the local bus CS1 */ /* Window base at flash base */ -#define CONFIG_SYS_LBLAWBAR1_PRELIM CONFIG_SYS_KMBEC_FPGA_BASE -#define CONFIG_SYS_LBLAWAR1_PRELIM (LBLAWAR_EN | LBLAWAR_128MB) - #define CONFIG_SYS_BR1_PRELIM (CONFIG_SYS_KMBEC_FPGA_BASE | \ BR_PS_8 | /* 8 bit port size */ \ BR_MS_GPCM | /* MSEL = GPCM */ \ @@ -333,10 +327,6 @@ #define CONFIG_SYS_PAXE_BASE 0xA0000000 #define CONFIG_SYS_PAXE_SIZE 256 -#define CONFIG_SYS_LBLAWBAR3_PRELIM CONFIG_SYS_PAXE_BASE - -#define CONFIG_SYS_LBLAWAR3_PRELIM 0x8000001C /* 512MB window size */ - #define CONFIG_SYS_BR3_PRELIM (\ CONFIG_SYS_PAXE_BASE | \ (1 << BR_PS_SHIFT) | \ diff --git a/include/configs/kmopti2.h b/include/configs/kmopti2.h index 6ac36c0f92..e732c2ad02 100644 --- a/include/configs/kmopti2.h +++ b/include/configs/kmopti2.h @@ -113,9 +113,6 @@ */ #define CONFIG_SYS_FLASH_SIZE 256 /* max FLASH size is 256M */ -#define CONFIG_SYS_LBLAWBAR0_PRELIM CONFIG_SYS_FLASH_BASE -#define CONFIG_SYS_LBLAWAR0_PRELIM (LBLAWAR_EN | LBLAWAR_256MB) - #define CONFIG_SYS_BR0_PRELIM (CONFIG_SYS_FLASH_BASE | \ BR_PS_16 | /* 16 bit port size */ \ BR_MS_GPCM | /* MSEL = GPCM */ \ @@ -134,9 +131,6 @@ * PRIO1/PIGGY on the local bus CS1 */ /* Window base at flash base */ -#define CONFIG_SYS_LBLAWBAR1_PRELIM CONFIG_SYS_KMBEC_FPGA_BASE -#define CONFIG_SYS_LBLAWAR1_PRELIM (LBLAWAR_EN | LBLAWAR_128MB) - #define CONFIG_SYS_BR1_PRELIM (CONFIG_SYS_KMBEC_FPGA_BASE | \ BR_PS_8 | /* 8 bit port size */ \ BR_MS_GPCM | /* MSEL = GPCM */ \ @@ -367,11 +361,6 @@ /* * Configuration for C2 on the local bus */ -/* Window base at flash base */ -#define CONFIG_SYS_LBLAWBAR2_PRELIM CONFIG_SYS_APP1_BASE -/* Window size: 256 MB */ -#define CONFIG_SYS_LBLAWAR2_PRELIM (LBLAWAR_EN | LBLAWAR_256MB) - #define CONFIG_SYS_BR2_PRELIM (CONFIG_SYS_APP1_BASE | \ BR_PS_8 | \ BR_MS_GPCM | \ @@ -388,8 +377,6 @@ /* * Configuration for C3 on the local bus */ -#define CONFIG_SYS_LBLAWBAR3_PRELIM CONFIG_SYS_APP2_BASE -#define CONFIG_SYS_LBLAWAR3_PRELIM (LBLAWAR_EN | LBLAWAR_256MB) #define CONFIG_SYS_BR3_PRELIM (CONFIG_SYS_APP2_BASE | \ BR_PS_16 | \ BR_MS_GPCM | \ diff --git a/include/configs/kmsupx5.h b/include/configs/kmsupx5.h index 7ee9a914a4..42fbdbf947 100644 --- a/include/configs/kmsupx5.h +++ b/include/configs/kmsupx5.h @@ -113,9 +113,6 @@ */ #define CONFIG_SYS_FLASH_SIZE 256 /* max FLASH size is 256M */ -#define CONFIG_SYS_LBLAWBAR0_PRELIM CONFIG_SYS_FLASH_BASE -#define CONFIG_SYS_LBLAWAR0_PRELIM (LBLAWAR_EN | LBLAWAR_256MB) - #define CONFIG_SYS_BR0_PRELIM (CONFIG_SYS_FLASH_BASE | \ BR_PS_16 | /* 16 bit port size */ \ BR_MS_GPCM | /* MSEL = GPCM */ \ @@ -134,9 +131,6 @@ * PRIO1/PIGGY on the local bus CS1 */ /* Window base at flash base */ -#define CONFIG_SYS_LBLAWBAR1_PRELIM CONFIG_SYS_KMBEC_FPGA_BASE -#define CONFIG_SYS_LBLAWAR1_PRELIM (LBLAWAR_EN | LBLAWAR_128MB) - #define CONFIG_SYS_BR1_PRELIM (CONFIG_SYS_KMBEC_FPGA_BASE | \ BR_PS_8 | /* 8 bit port size */ \ BR_MS_GPCM | /* MSEL = GPCM */ \ @@ -365,11 +359,6 @@ /* * Configuration for C2 on the local bus */ -/* Window base at flash base */ -#define CONFIG_SYS_LBLAWBAR2_PRELIM CONFIG_SYS_APP1_BASE -/* Window size: 256 MB */ -#define CONFIG_SYS_LBLAWAR2_PRELIM (LBLAWAR_EN | LBLAWAR_256MB) - #define CONFIG_SYS_BR2_PRELIM (CONFIG_SYS_APP1_BASE | \ BR_PS_8 | \ BR_MS_GPCM | \ diff --git a/include/configs/kmtegr1.h b/include/configs/kmtegr1.h index 53017faa1c..222eb72f8e 100644 --- a/include/configs/kmtegr1.h +++ b/include/configs/kmtegr1.h @@ -120,9 +120,6 @@ */ #define CONFIG_SYS_FLASH_SIZE 256 /* max FLASH size is 256M */ -#define CONFIG_SYS_LBLAWBAR0_PRELIM CONFIG_SYS_FLASH_BASE -#define CONFIG_SYS_LBLAWAR0_PRELIM (LBLAWAR_EN | LBLAWAR_256MB) - #define CONFIG_SYS_BR0_PRELIM (CONFIG_SYS_FLASH_BASE | \ BR_PS_16 | /* 16 bit port size */ \ BR_MS_GPCM | /* MSEL = GPCM */ \ @@ -141,9 +138,6 @@ * PRIO1/PIGGY on the local bus CS1 */ /* Window base at flash base */ -#define CONFIG_SYS_LBLAWBAR1_PRELIM CONFIG_SYS_KMBEC_FPGA_BASE -#define CONFIG_SYS_LBLAWAR1_PRELIM (LBLAWAR_EN | LBLAWAR_128MB) - #define CONFIG_SYS_BR1_PRELIM (CONFIG_SYS_KMBEC_FPGA_BASE | \ BR_PS_8 | /* 8 bit port size */ \ BR_MS_GPCM | /* MSEL = GPCM */ \ @@ -427,9 +421,6 @@ OR_GPCM_TRLX_CLEAR | \ OR_GPCM_EHTR_CLEAR) -#define CONFIG_SYS_LBLAWBAR3_PRELIM CONFIG_SYS_APP2_BASE -#define CONFIG_SYS_LBLAWAR3_PRELIM (LBLAWAR_EN | LBLAWAR_256MB) - /* ethernet port connected to piggy (UEC2) */ #define CONFIG_HAS_ETH1 #define CONFIG_UEC_ETH2 diff --git a/include/configs/kmtepr2.h b/include/configs/kmtepr2.h index 8f2be980a0..e542158022 100644 --- a/include/configs/kmtepr2.h +++ b/include/configs/kmtepr2.h @@ -113,9 +113,6 @@ */ #define CONFIG_SYS_FLASH_SIZE 256 /* max FLASH size is 256M */ -#define CONFIG_SYS_LBLAWBAR0_PRELIM CONFIG_SYS_FLASH_BASE -#define CONFIG_SYS_LBLAWAR0_PRELIM (LBLAWAR_EN | LBLAWAR_256MB) - #define CONFIG_SYS_BR0_PRELIM (CONFIG_SYS_FLASH_BASE | \ BR_PS_16 | /* 16 bit port size */ \ BR_MS_GPCM | /* MSEL = GPCM */ \ @@ -134,9 +131,6 @@ * PRIO1/PIGGY on the local bus CS1 */ /* Window base at flash base */ -#define CONFIG_SYS_LBLAWBAR1_PRELIM CONFIG_SYS_KMBEC_FPGA_BASE -#define CONFIG_SYS_LBLAWAR1_PRELIM (LBLAWAR_EN | LBLAWAR_128MB) - #define CONFIG_SYS_BR1_PRELIM (CONFIG_SYS_KMBEC_FPGA_BASE | \ BR_PS_8 | /* 8 bit port size */ \ BR_MS_GPCM | /* MSEL = GPCM */ \ @@ -367,11 +361,6 @@ /* * Configuration for C2 on the local bus */ -/* Window base at flash base */ -#define CONFIG_SYS_LBLAWBAR2_PRELIM CONFIG_SYS_APP1_BASE -/* Window size: 256 MB */ -#define CONFIG_SYS_LBLAWAR2_PRELIM (LBLAWAR_EN | LBLAWAR_256MB) - #define CONFIG_SYS_BR2_PRELIM (CONFIG_SYS_APP1_BASE | \ BR_PS_8 | \ BR_MS_GPCM | \ @@ -388,8 +377,6 @@ /* * Configuration for C3 on the local bus */ -#define CONFIG_SYS_LBLAWBAR3_PRELIM CONFIG_SYS_APP2_BASE -#define CONFIG_SYS_LBLAWAR3_PRELIM (LBLAWAR_EN | LBLAWAR_256MB) #define CONFIG_SYS_BR3_PRELIM (CONFIG_SYS_APP2_BASE | \ BR_PS_16 | \ BR_MS_GPCM | \ diff --git a/include/configs/kmvect1.h b/include/configs/kmvect1.h index 172a28e850..3e2cc60f3e 100644 --- a/include/configs/kmvect1.h +++ b/include/configs/kmvect1.h @@ -112,9 +112,6 @@ */ #define CONFIG_SYS_FLASH_SIZE 256 /* max FLASH size is 256M */ -#define CONFIG_SYS_LBLAWBAR0_PRELIM CONFIG_SYS_FLASH_BASE -#define CONFIG_SYS_LBLAWAR0_PRELIM (LBLAWAR_EN | LBLAWAR_256MB) - #define CONFIG_SYS_BR0_PRELIM (CONFIG_SYS_FLASH_BASE | \ BR_PS_16 | /* 16 bit port size */ \ BR_MS_GPCM | /* MSEL = GPCM */ \ @@ -133,9 +130,6 @@ * PRIO1/PIGGY on the local bus CS1 */ /* Window base at flash base */ -#define CONFIG_SYS_LBLAWBAR1_PRELIM CONFIG_SYS_KMBEC_FPGA_BASE -#define CONFIG_SYS_LBLAWAR1_PRELIM (LBLAWAR_EN | LBLAWAR_128MB) - #define CONFIG_SYS_BR1_PRELIM (CONFIG_SYS_KMBEC_FPGA_BASE | \ BR_PS_8 | /* 8 bit port size */ \ BR_MS_GPCM | /* MSEL = GPCM */ \ @@ -409,9 +403,6 @@ /* * APP1 on the local bus CS2 */ -#define CONFIG_SYS_LBLAWBAR2_PRELIM CONFIG_SYS_APP1_BASE -#define CONFIG_SYS_LBLAWAR2_PRELIM (LBLAWAR_EN | LBLAWAR_256MB) - #define CONFIG_SYS_BR2_PRELIM (CONFIG_SYS_APP1_BASE | \ BR_PS_16 | \ BR_MS_UPMA | \ @@ -431,10 +422,6 @@ #define CONFIG_SYS_MAMR (MxMR_GPL_x4DIS | \ 0x0000c000 | \ MxMR_WLFx_2X) - -#define CONFIG_SYS_LBLAWBAR3_PRELIM CONFIG_SYS_APP2_BASE -#define CONFIG_SYS_LBLAWAR3_PRELIM (LBLAWAR_EN | LBLAWAR_256MB) - /* * QE UEC ethernet configuration */ diff --git a/include/configs/mpc8308_p1m.h b/include/configs/mpc8308_p1m.h index 1bca11bd6e..aa9710f9c2 100644 --- a/include/configs/mpc8308_p1m.h +++ b/include/configs/mpc8308_p1m.h @@ -180,9 +180,6 @@ #define CONFIG_SYS_FLASH_SIZE 64 /* FLASH size is 64M */ /* Window base at flash base */ -#define CONFIG_SYS_LBLAWBAR0_PRELIM CONFIG_SYS_FLASH_BASE -#define CONFIG_SYS_LBLAWAR0_PRELIM (LBLAWAR_EN | LBLAWAR_64MB) - #define CONFIG_SYS_BR0_PRELIM (CONFIG_SYS_FLASH_BASE \ | BR_PS_16 /* 16 bit port */ \ | BR_MS_GPCM /* MSEL = GPCM */ \ @@ -217,9 +214,6 @@ | OR_GPCM_EHTR_SET) /* 0xFFFF8052 */ -#define CONFIG_SYS_LBLAWBAR1_PRELIM CONFIG_SYS_SJA1000_BASE -#define CONFIG_SYS_LBLAWAR1_PRELIM (LBLAWAR_EN | LBLAWAR_32KB) - /* * CPLD on Local Bus */ @@ -233,9 +227,6 @@ | OR_GPCM_EHTR_SET) /* 0xFFFF8042 */ -#define CONFIG_SYS_LBLAWBAR2_PRELIM CONFIG_SYS_CPLD_BASE -#define CONFIG_SYS_LBLAWAR2_PRELIM (LBLAWAR_EN | LBLAWAR_32KB) - /* * Serial Port */ diff --git a/include/configs/sbc8349.h b/include/configs/sbc8349.h index 8179147bc2..edf76e5851 100644 --- a/include/configs/sbc8349.h +++ b/include/configs/sbc8349.h @@ -114,10 +114,6 @@ | OR_GPCM_EAD) /* 0xFF806FF7 */ - /* window base at flash base */ -#define CONFIG_SYS_LBLAWBAR0_PRELIM CONFIG_SYS_FLASH_BASE -#define CONFIG_SYS_LBLAWAR0_PRELIM (LBLAWAR_EN | LBLAWAR_8MB) - #define CONFIG_SYS_MAX_FLASH_BANKS 1 /* number of banks */ #define CONFIG_SYS_MAX_FLASH_SECT 64 /* sectors per device */ @@ -180,9 +176,6 @@ | BR_MS_SDRAM \ | BR_V) /* 0xF0001861 */ -#define CONFIG_SYS_LBLAWBAR2_PRELIM CONFIG_SYS_LBC_SDRAM_BASE -#define CONFIG_SYS_LBLAWAR2_PRELIM (LBLAWAR_EN | LBLAWAR_64MB) - /* * The SDRAM size in MB, CONFIG_SYS_LBC_SDRAM_SIZE, is 64. * diff --git a/include/configs/strider.h b/include/configs/strider.h index a716096bed..3b0207488f 100644 --- a/include/configs/strider.h +++ b/include/configs/strider.h @@ -168,9 +168,6 @@ #define CONFIG_SYS_FLASH_SIZE 8 /* FLASH size is up to 8M */ /* Window base at flash base */ -#define CONFIG_SYS_LBLAWBAR0_PRELIM CONFIG_SYS_FLASH_BASE -#define CONFIG_SYS_LBLAWAR0_PRELIM (LBLAWAR_EN | LBLAWAR_8MB) - #define CONFIG_SYS_BR0_PRELIM (CONFIG_SYS_FLASH_BASE \ | BR_PS_16 /* 16 bit port */ \ | BR_MS_GPCM /* MSEL = GPCM */ \ @@ -197,9 +194,6 @@ #define CONFIG_SYS_FPGA0_SIZE 1 /* FPGA size is 1M */ /* Window base at FPGA base */ -#define CONFIG_SYS_LBLAWBAR1_PRELIM CONFIG_SYS_FPGA0_BASE -#define CONFIG_SYS_LBLAWAR1_PRELIM (LBLAWAR_EN | LBLAWAR_1MB) - #define CONFIG_SYS_BR1_PRELIM (CONFIG_SYS_FPGA0_BASE \ | BR_PS_16 /* 16 bit port */ \ | BR_MS_GPCM /* MSEL = GPCM */ \ diff --git a/include/configs/suvd3.h b/include/configs/suvd3.h index 6a4006ef6a..987b2d77cc 100644 --- a/include/configs/suvd3.h +++ b/include/configs/suvd3.h @@ -110,9 +110,6 @@ */ #define CONFIG_SYS_FLASH_SIZE 256 /* max FLASH size is 256M */ -#define CONFIG_SYS_LBLAWBAR0_PRELIM CONFIG_SYS_FLASH_BASE -#define CONFIG_SYS_LBLAWAR0_PRELIM (LBLAWAR_EN | LBLAWAR_256MB) - #define CONFIG_SYS_BR0_PRELIM (CONFIG_SYS_FLASH_BASE | \ BR_PS_16 | /* 16 bit port size */ \ BR_MS_GPCM | /* MSEL = GPCM */ \ @@ -131,9 +128,6 @@ * PRIO1/PIGGY on the local bus CS1 */ /* Window base at flash base */ -#define CONFIG_SYS_LBLAWBAR1_PRELIM CONFIG_SYS_KMBEC_FPGA_BASE -#define CONFIG_SYS_LBLAWAR1_PRELIM (LBLAWAR_EN | LBLAWAR_128MB) - #define CONFIG_SYS_BR1_PRELIM (CONFIG_SYS_KMBEC_FPGA_BASE | \ BR_PS_8 | /* 8 bit port size */ \ BR_MS_GPCM | /* MSEL = GPCM */ \ @@ -362,9 +356,6 @@ /* * APP1 on the local bus CS2 */ -#define CONFIG_SYS_LBLAWBAR2_PRELIM CONFIG_SYS_APP1_BASE -#define CONFIG_SYS_LBLAWAR2_PRELIM (LBLAWAR_EN | LBLAWAR_256MB) - #define CONFIG_SYS_BR2_PRELIM (CONFIG_SYS_APP1_BASE | \ BR_PS_16 | \ BR_MS_UPMA | \ @@ -384,8 +375,4 @@ #define CONFIG_SYS_MAMR (MxMR_GPL_x4DIS | \ 0x0000c000 | \ MxMR_WLFx_2X) - -#define CONFIG_SYS_LBLAWBAR3_PRELIM CONFIG_SYS_APP2_BASE -#define CONFIG_SYS_LBLAWAR3_PRELIM (LBLAWAR_EN | LBLAWAR_256MB) - #endif /* __CONFIG_H */ diff --git a/include/configs/tuge1.h b/include/configs/tuge1.h index 5bb74fd9ae..5fceac7ae1 100644 --- a/include/configs/tuge1.h +++ b/include/configs/tuge1.h @@ -113,9 +113,6 @@ */ #define CONFIG_SYS_FLASH_SIZE 256 /* max FLASH size is 256M */ -#define CONFIG_SYS_LBLAWBAR0_PRELIM CONFIG_SYS_FLASH_BASE -#define CONFIG_SYS_LBLAWAR0_PRELIM (LBLAWAR_EN | LBLAWAR_256MB) - #define CONFIG_SYS_BR0_PRELIM (CONFIG_SYS_FLASH_BASE | \ BR_PS_16 | /* 16 bit port size */ \ BR_MS_GPCM | /* MSEL = GPCM */ \ @@ -134,9 +131,6 @@ * PRIO1/PIGGY on the local bus CS1 */ /* Window base at flash base */ -#define CONFIG_SYS_LBLAWBAR1_PRELIM CONFIG_SYS_KMBEC_FPGA_BASE -#define CONFIG_SYS_LBLAWAR1_PRELIM (LBLAWAR_EN | LBLAWAR_128MB) - #define CONFIG_SYS_BR1_PRELIM (CONFIG_SYS_KMBEC_FPGA_BASE | \ BR_PS_8 | /* 8 bit port size */ \ BR_MS_GPCM | /* MSEL = GPCM */ \ @@ -365,11 +359,6 @@ /* * Configuration for C2 on the local bus */ -/* Window base at flash base */ -#define CONFIG_SYS_LBLAWBAR2_PRELIM CONFIG_SYS_APP1_BASE -/* Window size: 256 MB */ -#define CONFIG_SYS_LBLAWAR2_PRELIM (LBLAWAR_EN | LBLAWAR_256MB) - #define CONFIG_SYS_BR2_PRELIM (CONFIG_SYS_APP1_BASE | \ BR_PS_8 | \ BR_MS_GPCM | \ diff --git a/include/configs/tuxx1.h b/include/configs/tuxx1.h index 49f77efa74..1b97d0fecb 100644 --- a/include/configs/tuxx1.h +++ b/include/configs/tuxx1.h @@ -113,9 +113,6 @@ */ #define CONFIG_SYS_FLASH_SIZE 256 /* max FLASH size is 256M */ -#define CONFIG_SYS_LBLAWBAR0_PRELIM CONFIG_SYS_FLASH_BASE -#define CONFIG_SYS_LBLAWAR0_PRELIM (LBLAWAR_EN | LBLAWAR_256MB) - #define CONFIG_SYS_BR0_PRELIM (CONFIG_SYS_FLASH_BASE | \ BR_PS_16 | /* 16 bit port size */ \ BR_MS_GPCM | /* MSEL = GPCM */ \ @@ -134,9 +131,6 @@ * PRIO1/PIGGY on the local bus CS1 */ /* Window base at flash base */ -#define CONFIG_SYS_LBLAWBAR1_PRELIM CONFIG_SYS_KMBEC_FPGA_BASE -#define CONFIG_SYS_LBLAWAR1_PRELIM (LBLAWAR_EN | LBLAWAR_128MB) - #define CONFIG_SYS_BR1_PRELIM (CONFIG_SYS_KMBEC_FPGA_BASE | \ BR_PS_8 | /* 8 bit port size */ \ BR_MS_GPCM | /* MSEL = GPCM */ \ @@ -367,11 +361,6 @@ /* * Configuration for C2 on the local bus */ -/* Window base at flash base */ -#define CONFIG_SYS_LBLAWBAR2_PRELIM CONFIG_SYS_APP1_BASE -/* Window size: 256 MB */ -#define CONFIG_SYS_LBLAWAR2_PRELIM (LBLAWAR_EN | LBLAWAR_256MB) - #define CONFIG_SYS_BR2_PRELIM (CONFIG_SYS_APP1_BASE | \ BR_PS_8 | \ BR_MS_GPCM | \ @@ -388,11 +377,6 @@ /* * Configuration for C3 on the local bus */ -/* Access window base at PINC3 base */ -#define CONFIG_SYS_LBLAWBAR3_PRELIM CONFIG_SYS_APP2_BASE -/* Window size: 256 MB */ -#define CONFIG_SYS_LBLAWAR3_PRELIM (LBLAWAR_EN | LBLAWAR_256MB) - #define CONFIG_SYS_BR3_PRELIM (CONFIG_SYS_APP2_BASE | \ BR_PS_8 | \ BR_MS_GPCM | \ diff --git a/include/configs/ve8313.h b/include/configs/ve8313.h index 84d2c897d7..7dcc150f19 100644 --- a/include/configs/ve8313.h +++ b/include/configs/ve8313.h @@ -111,9 +111,6 @@ #define CONFIG_SYS_FLASH_SIZE 32 /* size in MB */ #define CONFIG_SYS_FLASH_EMPTY_INFO /* display empty sectors */ -#define CONFIG_SYS_LBLAWBAR0_PRELIM CONFIG_SYS_FLASH_BASE -#define CONFIG_SYS_LBLAWAR0_PRELIM (LBLAWAR_EN | LBLAWAR_32MB) - #define CONFIG_SYS_MAX_FLASH_BANKS 1 /* number of banks */ #define CONFIG_SYS_MAX_FLASH_SECT 256 /* sectors per dev */ @@ -186,12 +183,6 @@ #define CONFIG_SYS_NAND_BR_PRELIM CONFIG_SYS_BR1_PRELIM #define CONFIG_SYS_NAND_OR_PRELIM CONFIG_SYS_OR1_PRELIM -#define CONFIG_SYS_LBLAWBAR1_PRELIM CONFIG_SYS_NAND_BASE -#define CONFIG_SYS_LBLAWAR1_PRELIM (LBLAWAR_EN | LBLAWAR_32KB) - -#define CONFIG_SYS_NAND_LBLAWBAR_PRELIM CONFIG_SYS_LBLAWBAR1_PRELIM -#define CONFIG_SYS_NAND_LBLAWAR_PRELIM CONFIG_SYS_LBLAWAR1_PRELIM - /* CS2 NvRAM */ #define CONFIG_SYS_BR2_PRELIM (0x60000000 \ | BR_PS_8 \ diff --git a/include/configs/vme8349.h b/include/configs/vme8349.h index 249783720c..ed02661f82 100644 --- a/include/configs/vme8349.h +++ b/include/configs/vme8349.h @@ -84,8 +84,6 @@ | OR_GPCM_EHTR_SET \ | OR_GPCM_EAD) /* 0xf8006ff7 */ -#define CONFIG_SYS_LBLAWBAR0_PRELIM CONFIG_SYS_FLASH_BASE -#define CONFIG_SYS_LBLAWAR0_PRELIM (LBLAWAR_EN | LBLAWAR_128MB) #define CONFIG_SYS_WINDOW1_BASE 0xf0000000 #define CONFIG_SYS_BR1_PRELIM (CONFIG_SYS_WINDOW1_BASE \ @@ -96,8 +94,6 @@ #define CONFIG_SYS_OR1_PRELIM (OR_AM_256KB \ | OR_GPCM_SETA) /* 0xfffc0208 */ -#define CONFIG_SYS_LBLAWBAR1_PRELIM CONFIG_SYS_WINDOW1_BASE -#define CONFIG_SYS_LBLAWAR1_PRELIM (LBLAWAR_EN | LBLAWAR_256KB) #define CONFIG_SYS_MAX_FLASH_BANKS 1 /* number of banks */ #define CONFIG_SYS_MAX_FLASH_SECT 1024 /* sectors per device*/ diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt index 4f0e9f75d5..8473c369fe 100644 --- a/scripts/config_whitelist.txt +++ b/scripts/config_whitelist.txt @@ -3208,22 +3208,6 @@ CONFIG_SYS_LBC_NONCACHE_BASE CONFIG_SYS_LBC_SDRAM_BASE CONFIG_SYS_LBC_SDRAM_BASE_PHYS CONFIG_SYS_LBC_SDRAM_SIZE -CONFIG_SYS_LBLAWAR0_PRELIM -CONFIG_SYS_LBLAWAR1_PRELIM -CONFIG_SYS_LBLAWAR2_PRELIM -CONFIG_SYS_LBLAWAR3_PRELIM -CONFIG_SYS_LBLAWAR4_PRELIM -CONFIG_SYS_LBLAWAR5_PRELIM -CONFIG_SYS_LBLAWAR6_PRELIM -CONFIG_SYS_LBLAWAR7_PRELIM -CONFIG_SYS_LBLAWBAR0_PRELIM -CONFIG_SYS_LBLAWBAR1_PRELIM -CONFIG_SYS_LBLAWBAR2_PRELIM -CONFIG_SYS_LBLAWBAR3_PRELIM -CONFIG_SYS_LBLAWBAR4_PRELIM -CONFIG_SYS_LBLAWBAR5_PRELIM -CONFIG_SYS_LBLAWBAR6_PRELIM -CONFIG_SYS_LBLAWBAR7_PRELIM CONFIG_SYS_LB_SDRAM CONFIG_SYS_LCD_BASE CONFIG_SYS_LCRR_CLKDIV |