From 797b7b6b1bc31350b3b95dc9c7ece5db712e642c Mon Sep 17 00:00:00 2001 From: =?utf8?q?Lothar=20Wa=C3=9Fmann?= Date: Mon, 18 Apr 2016 14:43:29 +0200 Subject: [PATCH] karo: tx6: add support for boards with >= 2GiB memory --- board/karo/tx6/Kconfig | 3 +++ board/karo/tx6/tx6qdl.c | 4 ++-- configs/tx6q-1020_defconfig | 1 + configs/tx6q-1020_mfg_defconfig | 1 + configs/tx6q-1020_noenv_defconfig | 1 + configs/tx6q-1020_sec_defconfig | 1 + configs/tx6q-1036_defconfig | 3 ++- configs/tx6q-1036_mfg_defconfig | 3 ++- configs/tx6q-1036_noenv_defconfig | 3 ++- configs/tx6q-1036_sec_defconfig | 3 ++- configs/tx6q-10x0_defconfig | 1 + configs/tx6q-10x0_mfg_defconfig | 1 + configs/tx6q-10x0_noenv_defconfig | 1 + configs/tx6q-10x0_sec_defconfig | 1 + configs/tx6q-11x0_defconfig | 1 + configs/tx6q-11x0_mfg_defconfig | 1 + configs/tx6q-11x0_noenv_defconfig | 1 + configs/tx6q-11x0_sec_defconfig | 1 + configs/tx6s-8034_defconfig | 1 + configs/tx6s-8034_mfg_defconfig | 1 + configs/tx6s-8034_noenv_defconfig | 1 + configs/tx6s-8034_sec_defconfig | 1 + configs/tx6s-8035_defconfig | 1 + configs/tx6s-8035_mfg_defconfig | 1 + configs/tx6s-8035_noenv_defconfig | 1 + configs/tx6s-8035_sec_defconfig | 1 + configs/tx6u-8011_defconfig | 1 + configs/tx6u-8011_mfg_defconfig | 1 + configs/tx6u-8011_noenv_defconfig | 1 + configs/tx6u-8011_sec_defconfig | 1 + configs/tx6u-8012_defconfig | 1 + configs/tx6u-8012_mfg_defconfig | 1 + configs/tx6u-8012_noenv_defconfig | 1 + configs/tx6u-8012_sec_defconfig | 1 + configs/tx6u-8033_defconfig | 1 + configs/tx6u-8033_mfg_defconfig | 1 + configs/tx6u-8033_noenv_defconfig | 1 + configs/tx6u-8033_sec_defconfig | 1 + configs/tx6u-80x0_defconfig | 1 + configs/tx6u-80x0_mfg_defconfig | 1 + configs/tx6u-80x0_noenv_defconfig | 1 + configs/tx6u-80x0_sec_defconfig | 1 + configs/tx6u-8111_defconfig | 1 + configs/tx6u-8111_mfg_defconfig | 1 + configs/tx6u-8111_noenv_defconfig | 1 + configs/tx6u-8111_sec_defconfig | 1 + configs/tx6u-81x0_defconfig | 1 + configs/tx6u-81x0_mfg_defconfig | 1 + configs/tx6u-81x0_noenv_defconfig | 1 + configs/tx6u-81x0_sec_defconfig | 1 + configs/tx6ul-0010_defconfig | 1 + configs/tx6ul-0010_mfg_defconfig | 1 + configs/tx6ul-0010_noenv_defconfig | 1 + configs/tx6ul-0010_sec_defconfig | 1 + configs/tx6ul-0011_defconfig | 1 + configs/tx6ul-0011_mfg_defconfig | 1 + configs/tx6ul-0011_noenv_defconfig | 1 + configs/tx6ul-0011_sec_defconfig | 1 + include/configs/tx6.h | 16 +++++++++++++++- 59 files changed, 80 insertions(+), 7 deletions(-) diff --git a/board/karo/tx6/Kconfig b/board/karo/tx6/Kconfig index 51898a379e..8800d059c4 100644 --- a/board/karo/tx6/Kconfig +++ b/board/karo/tx6/Kconfig @@ -68,6 +68,9 @@ config SYS_SDRAM_BUS_WIDTH_16 config SYS_SDRAM_BUS_WIDTH_32 bool +config SYS_SDRAM_CHIP_SIZE + int "SDRAM chip size in MiB" + choice prompt "TX6 module variant" diff --git a/board/karo/tx6/tx6qdl.c b/board/karo/tx6/tx6qdl.c index 6a0564ef94..1b3c39cacc 100644 --- a/board/karo/tx6/tx6qdl.c +++ b/board/karo/tx6/tx6qdl.c @@ -522,8 +522,8 @@ int dram_init(void) void dram_init_banksize(void) { - debug("%s@%d: \n", __func__, __LINE__); - + debug("%s@%d: chip_size=%u (%u bit bus width)\n", __func__, __LINE__, + CONFIG_SYS_SDRAM_CHIP_SIZE, CONFIG_SYS_SDRAM_BUS_WIDTH); gd->bd->bi_dram[0].start = PHYS_SDRAM_1; gd->bd->bi_dram[0].size = get_ram_size((void *)PHYS_SDRAM_1, PHYS_SDRAM_1_SIZE); diff --git a/configs/tx6q-1020_defconfig b/configs/tx6q-1020_defconfig index cb762d7b47..b8567d93a9 100644 --- a/configs/tx6q-1020_defconfig +++ b/configs/tx6q-1020_defconfig @@ -30,3 +30,4 @@ CONFIG_NET=y CONFIG_NETDEVICES=y CONFIG_PHY_SMSC=y CONFIG_SYS_PROMPT="TX6Q U-Boot > " +CONFIG_SYS_SDRAM_CHIP_SIZE=512 diff --git a/configs/tx6q-1020_mfg_defconfig b/configs/tx6q-1020_mfg_defconfig index 7ca7e98358..92513b5db4 100644 --- a/configs/tx6q-1020_mfg_defconfig +++ b/configs/tx6q-1020_mfg_defconfig @@ -29,3 +29,4 @@ CONFIG_NET=y CONFIG_NETDEVICES=y CONFIG_PHY_SMSC=y CONFIG_SYS_PROMPT="TX6Q U-Boot > " +CONFIG_SYS_SDRAM_CHIP_SIZE=512 diff --git a/configs/tx6q-1020_noenv_defconfig b/configs/tx6q-1020_noenv_defconfig index 4daf94d124..c60060a4a1 100644 --- a/configs/tx6q-1020_noenv_defconfig +++ b/configs/tx6q-1020_noenv_defconfig @@ -29,3 +29,4 @@ CONFIG_NET=y CONFIG_NETDEVICES=y CONFIG_PHY_SMSC=y CONFIG_SYS_PROMPT="TX6Q U-Boot > " +CONFIG_SYS_SDRAM_CHIP_SIZE=512 diff --git a/configs/tx6q-1020_sec_defconfig b/configs/tx6q-1020_sec_defconfig index bc643ede10..c55066a03d 100644 --- a/configs/tx6q-1020_sec_defconfig +++ b/configs/tx6q-1020_sec_defconfig @@ -30,3 +30,4 @@ CONFIG_NET=y CONFIG_NETDEVICES=y CONFIG_PHY_SMSC=y CONFIG_SYS_PROMPT="TX6Q U-Boot > " +CONFIG_SYS_SDRAM_CHIP_SIZE=512 diff --git a/configs/tx6q-1036_defconfig b/configs/tx6q-1036_defconfig index 26aea782d1..cce4940040 100644 --- a/configs/tx6q-1036_defconfig +++ b/configs/tx6q-1036_defconfig @@ -1,4 +1,4 @@ -CONFIG_SYS_EXTRA_OPTIONS="MMC_BOOT_SIZE=1024" +CONFIG_SYS_EXTRA_OPTIONS="MMC_BOOT_SIZE=4096" CONFIG_ARM=y CONFIG_ARCH_MX6=y CONFIG_TARGET_TX6=y @@ -30,3 +30,4 @@ CONFIG_NET=y CONFIG_NETDEVICES=y CONFIG_PHY_SMSC=y CONFIG_SYS_PROMPT="TX6Q U-Boot > " +CONFIG_SYS_SDRAM_CHIP_SIZE=512 diff --git a/configs/tx6q-1036_mfg_defconfig b/configs/tx6q-1036_mfg_defconfig index 84d42699d7..b44e41c040 100644 --- a/configs/tx6q-1036_mfg_defconfig +++ b/configs/tx6q-1036_mfg_defconfig @@ -1,4 +1,4 @@ -CONFIG_SYS_EXTRA_OPTIONS="MMC_BOOT_SIZE=1024" +CONFIG_SYS_EXTRA_OPTIONS="MMC_BOOT_SIZE=4096" CONFIG_ARM=y CONFIG_ARCH_MX6=y CONFIG_TARGET_TX6=y @@ -29,3 +29,4 @@ CONFIG_NET=y CONFIG_NETDEVICES=y CONFIG_PHY_SMSC=y CONFIG_SYS_PROMPT="TX6Q U-Boot > " +CONFIG_SYS_SDRAM_CHIP_SIZE=512 diff --git a/configs/tx6q-1036_noenv_defconfig b/configs/tx6q-1036_noenv_defconfig index cff849de3c..bc6dd53a41 100644 --- a/configs/tx6q-1036_noenv_defconfig +++ b/configs/tx6q-1036_noenv_defconfig @@ -1,4 +1,4 @@ -CONFIG_SYS_EXTRA_OPTIONS="MMC_BOOT_SIZE=1024" +CONFIG_SYS_EXTRA_OPTIONS="MMC_BOOT_SIZE=4096" CONFIG_ARM=y CONFIG_ARCH_MX6=y CONFIG_TARGET_TX6=y @@ -29,3 +29,4 @@ CONFIG_NET=y CONFIG_NETDEVICES=y CONFIG_PHY_SMSC=y CONFIG_SYS_PROMPT="TX6Q U-Boot > " +CONFIG_SYS_SDRAM_CHIP_SIZE=512 diff --git a/configs/tx6q-1036_sec_defconfig b/configs/tx6q-1036_sec_defconfig index e921cbe8c7..7a775a965f 100644 --- a/configs/tx6q-1036_sec_defconfig +++ b/configs/tx6q-1036_sec_defconfig @@ -1,4 +1,4 @@ -CONFIG_SYS_EXTRA_OPTIONS="MMC_BOOT_SIZE=1024,SECURE_BOOT" +CONFIG_SYS_EXTRA_OPTIONS="MMC_BOOT_SIZE=4096,SECURE_BOOT" CONFIG_ARM=y CONFIG_ARCH_MX6=y CONFIG_TARGET_TX6=y @@ -30,3 +30,4 @@ CONFIG_NET=y CONFIG_NETDEVICES=y CONFIG_PHY_SMSC=y CONFIG_SYS_PROMPT="TX6Q U-Boot > " +CONFIG_SYS_SDRAM_CHIP_SIZE=512 diff --git a/configs/tx6q-10x0_defconfig b/configs/tx6q-10x0_defconfig index eea31335de..fb4dc15cf8 100644 --- a/configs/tx6q-10x0_defconfig +++ b/configs/tx6q-10x0_defconfig @@ -33,3 +33,4 @@ CONFIG_NET=y CONFIG_NETDEVICES=y CONFIG_PHY_SMSC=y CONFIG_SYS_PROMPT="TX6Q U-Boot > " +CONFIG_SYS_SDRAM_CHIP_SIZE=512 diff --git a/configs/tx6q-10x0_mfg_defconfig b/configs/tx6q-10x0_mfg_defconfig index 3e44d7fd45..97e06350d0 100644 --- a/configs/tx6q-10x0_mfg_defconfig +++ b/configs/tx6q-10x0_mfg_defconfig @@ -32,3 +32,4 @@ CONFIG_NET=y CONFIG_NETDEVICES=y CONFIG_PHY_SMSC=y CONFIG_SYS_PROMPT="TX6Q U-Boot > " +CONFIG_SYS_SDRAM_CHIP_SIZE=512 diff --git a/configs/tx6q-10x0_noenv_defconfig b/configs/tx6q-10x0_noenv_defconfig index 659a8d5f4d..5b63d3a059 100644 --- a/configs/tx6q-10x0_noenv_defconfig +++ b/configs/tx6q-10x0_noenv_defconfig @@ -32,3 +32,4 @@ CONFIG_NET=y CONFIG_NETDEVICES=y CONFIG_PHY_SMSC=y CONFIG_SYS_PROMPT="TX6Q U-Boot > " +CONFIG_SYS_SDRAM_CHIP_SIZE=512 diff --git a/configs/tx6q-10x0_sec_defconfig b/configs/tx6q-10x0_sec_defconfig index c3013fa704..cd2db4b85c 100644 --- a/configs/tx6q-10x0_sec_defconfig +++ b/configs/tx6q-10x0_sec_defconfig @@ -34,3 +34,4 @@ CONFIG_NET=y CONFIG_NETDEVICES=y CONFIG_PHY_SMSC=y CONFIG_SYS_PROMPT="TX6Q U-Boot > " +CONFIG_SYS_SDRAM_CHIP_SIZE=512 diff --git a/configs/tx6q-11x0_defconfig b/configs/tx6q-11x0_defconfig index b1bda302ad..4856a32cec 100644 --- a/configs/tx6q-11x0_defconfig +++ b/configs/tx6q-11x0_defconfig @@ -34,3 +34,4 @@ CONFIG_NET=y CONFIG_NETDEVICES=y CONFIG_PHY_SMSC=y CONFIG_SYS_PROMPT="TX6Q U-Boot > " +CONFIG_SYS_SDRAM_CHIP_SIZE=512 diff --git a/configs/tx6q-11x0_mfg_defconfig b/configs/tx6q-11x0_mfg_defconfig index 31cc0290f0..25d7b101d0 100644 --- a/configs/tx6q-11x0_mfg_defconfig +++ b/configs/tx6q-11x0_mfg_defconfig @@ -33,3 +33,4 @@ CONFIG_NET=y CONFIG_NETDEVICES=y CONFIG_PHY_SMSC=y CONFIG_SYS_PROMPT="TX6Q U-Boot > " +CONFIG_SYS_SDRAM_CHIP_SIZE=512 diff --git a/configs/tx6q-11x0_noenv_defconfig b/configs/tx6q-11x0_noenv_defconfig index f425b6691b..50d1be5c36 100644 --- a/configs/tx6q-11x0_noenv_defconfig +++ b/configs/tx6q-11x0_noenv_defconfig @@ -33,3 +33,4 @@ CONFIG_NET=y CONFIG_NETDEVICES=y CONFIG_PHY_SMSC=y CONFIG_SYS_PROMPT="TX6Q U-Boot > " +CONFIG_SYS_SDRAM_CHIP_SIZE=512 diff --git a/configs/tx6q-11x0_sec_defconfig b/configs/tx6q-11x0_sec_defconfig index 3a3743aeb7..4a0a117720 100644 --- a/configs/tx6q-11x0_sec_defconfig +++ b/configs/tx6q-11x0_sec_defconfig @@ -34,3 +34,4 @@ CONFIG_NET=y CONFIG_NETDEVICES=y CONFIG_PHY_SMSC=y CONFIG_SYS_PROMPT="TX6Q U-Boot > " +CONFIG_SYS_SDRAM_CHIP_SIZE=512 diff --git a/configs/tx6s-8034_defconfig b/configs/tx6s-8034_defconfig index a9cf013eef..ff723a7831 100644 --- a/configs/tx6s-8034_defconfig +++ b/configs/tx6s-8034_defconfig @@ -34,3 +34,4 @@ CONFIG_NET=y CONFIG_NETDEVICES=y CONFIG_PHY_SMSC=y CONFIG_SYS_PROMPT="TX6S U-Boot > " +CONFIG_SYS_SDRAM_CHIP_SIZE=512 diff --git a/configs/tx6s-8034_mfg_defconfig b/configs/tx6s-8034_mfg_defconfig index 9911608ac1..a639f137ad 100644 --- a/configs/tx6s-8034_mfg_defconfig +++ b/configs/tx6s-8034_mfg_defconfig @@ -33,3 +33,4 @@ CONFIG_NET=y CONFIG_NETDEVICES=y CONFIG_PHY_SMSC=y CONFIG_SYS_PROMPT="TX6S U-Boot > " +CONFIG_SYS_SDRAM_CHIP_SIZE=512 diff --git a/configs/tx6s-8034_noenv_defconfig b/configs/tx6s-8034_noenv_defconfig index 0190681aa5..ed4e98d126 100644 --- a/configs/tx6s-8034_noenv_defconfig +++ b/configs/tx6s-8034_noenv_defconfig @@ -33,3 +33,4 @@ CONFIG_NET=y CONFIG_NETDEVICES=y CONFIG_PHY_SMSC=y CONFIG_SYS_PROMPT="TX6S U-Boot > " +CONFIG_SYS_SDRAM_CHIP_SIZE=512 diff --git a/configs/tx6s-8034_sec_defconfig b/configs/tx6s-8034_sec_defconfig index 1805933be0..4bdc10b75d 100644 --- a/configs/tx6s-8034_sec_defconfig +++ b/configs/tx6s-8034_sec_defconfig @@ -34,3 +34,4 @@ CONFIG_NET=y CONFIG_NETDEVICES=y CONFIG_PHY_SMSC=y CONFIG_SYS_PROMPT="TX6S U-Boot > " +CONFIG_SYS_SDRAM_CHIP_SIZE=512 diff --git a/configs/tx6s-8035_defconfig b/configs/tx6s-8035_defconfig index 5b55780b22..8656148958 100644 --- a/configs/tx6s-8035_defconfig +++ b/configs/tx6s-8035_defconfig @@ -30,3 +30,4 @@ CONFIG_NET=y CONFIG_NETDEVICES=y CONFIG_PHY_SMSC=y CONFIG_SYS_PROMPT="TX6S U-Boot > " +CONFIG_SYS_SDRAM_CHIP_SIZE=512 diff --git a/configs/tx6s-8035_mfg_defconfig b/configs/tx6s-8035_mfg_defconfig index 3221561896..1b2f6d6554 100644 --- a/configs/tx6s-8035_mfg_defconfig +++ b/configs/tx6s-8035_mfg_defconfig @@ -29,3 +29,4 @@ CONFIG_NET=y CONFIG_NETDEVICES=y CONFIG_PHY_SMSC=y CONFIG_SYS_PROMPT="TX6S U-Boot > " +CONFIG_SYS_SDRAM_CHIP_SIZE=512 diff --git a/configs/tx6s-8035_noenv_defconfig b/configs/tx6s-8035_noenv_defconfig index ddebb7b73b..52241abc5f 100644 --- a/configs/tx6s-8035_noenv_defconfig +++ b/configs/tx6s-8035_noenv_defconfig @@ -29,3 +29,4 @@ CONFIG_NET=y CONFIG_NETDEVICES=y CONFIG_PHY_SMSC=y CONFIG_SYS_PROMPT="TX6S U-Boot > " +CONFIG_SYS_SDRAM_CHIP_SIZE=512 diff --git a/configs/tx6s-8035_sec_defconfig b/configs/tx6s-8035_sec_defconfig index 5defc23cfa..ea6e847df4 100644 --- a/configs/tx6s-8035_sec_defconfig +++ b/configs/tx6s-8035_sec_defconfig @@ -30,3 +30,4 @@ CONFIG_NET=y CONFIG_NETDEVICES=y CONFIG_PHY_SMSC=y CONFIG_SYS_PROMPT="TX6S U-Boot > " +CONFIG_SYS_SDRAM_CHIP_SIZE=512 diff --git a/configs/tx6u-8011_defconfig b/configs/tx6u-8011_defconfig index 7c0c1f0eaf..ca0371c4a4 100644 --- a/configs/tx6u-8011_defconfig +++ b/configs/tx6u-8011_defconfig @@ -34,3 +34,4 @@ CONFIG_NET=y CONFIG_NETDEVICES=y CONFIG_PHY_SMSC=y CONFIG_SYS_PROMPT="TX6DL U-Boot > " +CONFIG_SYS_SDRAM_CHIP_SIZE=512 diff --git a/configs/tx6u-8011_mfg_defconfig b/configs/tx6u-8011_mfg_defconfig index 28f59a4029..3fca82e3f7 100644 --- a/configs/tx6u-8011_mfg_defconfig +++ b/configs/tx6u-8011_mfg_defconfig @@ -33,3 +33,4 @@ CONFIG_NET=y CONFIG_NETDEVICES=y CONFIG_PHY_SMSC=y CONFIG_SYS_PROMPT="TX6DL U-Boot > " +CONFIG_SYS_SDRAM_CHIP_SIZE=512 diff --git a/configs/tx6u-8011_noenv_defconfig b/configs/tx6u-8011_noenv_defconfig index 446dca15d5..26f0c76a6e 100644 --- a/configs/tx6u-8011_noenv_defconfig +++ b/configs/tx6u-8011_noenv_defconfig @@ -33,3 +33,4 @@ CONFIG_NET=y CONFIG_NETDEVICES=y CONFIG_PHY_SMSC=y CONFIG_SYS_PROMPT="TX6DL U-Boot > " +CONFIG_SYS_SDRAM_CHIP_SIZE=512 diff --git a/configs/tx6u-8011_sec_defconfig b/configs/tx6u-8011_sec_defconfig index dfd4fccdc5..20f697d6d0 100644 --- a/configs/tx6u-8011_sec_defconfig +++ b/configs/tx6u-8011_sec_defconfig @@ -34,3 +34,4 @@ CONFIG_NET=y CONFIG_NETDEVICES=y CONFIG_PHY_SMSC=y CONFIG_SYS_PROMPT="TX6DL U-Boot > " +CONFIG_SYS_SDRAM_CHIP_SIZE=512 diff --git a/configs/tx6u-8012_defconfig b/configs/tx6u-8012_defconfig index a9280a820d..7d0d775c2d 100644 --- a/configs/tx6u-8012_defconfig +++ b/configs/tx6u-8012_defconfig @@ -34,3 +34,4 @@ CONFIG_NET=y CONFIG_NETDEVICES=y CONFIG_PHY_SMSC=y CONFIG_SYS_PROMPT="TX6DL U-Boot > " +CONFIG_SYS_SDRAM_CHIP_SIZE=512 diff --git a/configs/tx6u-8012_mfg_defconfig b/configs/tx6u-8012_mfg_defconfig index 6aa41bd077..398d38d8a2 100644 --- a/configs/tx6u-8012_mfg_defconfig +++ b/configs/tx6u-8012_mfg_defconfig @@ -33,3 +33,4 @@ CONFIG_NET=y CONFIG_NETDEVICES=y CONFIG_PHY_SMSC=y CONFIG_SYS_PROMPT="TX6DL U-Boot > " +CONFIG_SYS_SDRAM_CHIP_SIZE=512 diff --git a/configs/tx6u-8012_noenv_defconfig b/configs/tx6u-8012_noenv_defconfig index 192fb01b63..78f1e7487d 100644 --- a/configs/tx6u-8012_noenv_defconfig +++ b/configs/tx6u-8012_noenv_defconfig @@ -33,3 +33,4 @@ CONFIG_NET=y CONFIG_NETDEVICES=y CONFIG_PHY_SMSC=y CONFIG_SYS_PROMPT="TX6DL U-Boot > " +CONFIG_SYS_SDRAM_CHIP_SIZE=512 diff --git a/configs/tx6u-8012_sec_defconfig b/configs/tx6u-8012_sec_defconfig index 4ad5a3cf3b..fadc106a5b 100644 --- a/configs/tx6u-8012_sec_defconfig +++ b/configs/tx6u-8012_sec_defconfig @@ -34,3 +34,4 @@ CONFIG_NET=y CONFIG_NETDEVICES=y CONFIG_PHY_SMSC=y CONFIG_SYS_PROMPT="TX6DL U-Boot > " +CONFIG_SYS_SDRAM_CHIP_SIZE=512 diff --git a/configs/tx6u-8033_defconfig b/configs/tx6u-8033_defconfig index 3b3ee92269..0a08ec10a0 100644 --- a/configs/tx6u-8033_defconfig +++ b/configs/tx6u-8033_defconfig @@ -30,3 +30,4 @@ CONFIG_NET=y CONFIG_NETDEVICES=y CONFIG_PHY_SMSC=y CONFIG_SYS_PROMPT="TX6DL U-Boot > " +CONFIG_SYS_SDRAM_CHIP_SIZE=512 diff --git a/configs/tx6u-8033_mfg_defconfig b/configs/tx6u-8033_mfg_defconfig index be28fe0ee8..f5104b085b 100644 --- a/configs/tx6u-8033_mfg_defconfig +++ b/configs/tx6u-8033_mfg_defconfig @@ -29,3 +29,4 @@ CONFIG_NET=y CONFIG_NETDEVICES=y CONFIG_PHY_SMSC=y CONFIG_SYS_PROMPT="TX6DL U-Boot > " +CONFIG_SYS_SDRAM_CHIP_SIZE=512 diff --git a/configs/tx6u-8033_noenv_defconfig b/configs/tx6u-8033_noenv_defconfig index 39feb649dc..10f957107f 100644 --- a/configs/tx6u-8033_noenv_defconfig +++ b/configs/tx6u-8033_noenv_defconfig @@ -29,3 +29,4 @@ CONFIG_NET=y CONFIG_NETDEVICES=y CONFIG_PHY_SMSC=y CONFIG_SYS_PROMPT="TX6DL U-Boot > " +CONFIG_SYS_SDRAM_CHIP_SIZE=512 diff --git a/configs/tx6u-8033_sec_defconfig b/configs/tx6u-8033_sec_defconfig index 5e0a70a092..35de96e094 100644 --- a/configs/tx6u-8033_sec_defconfig +++ b/configs/tx6u-8033_sec_defconfig @@ -30,3 +30,4 @@ CONFIG_NET=y CONFIG_NETDEVICES=y CONFIG_PHY_SMSC=y CONFIG_SYS_PROMPT="TX6DL U-Boot > " +CONFIG_SYS_SDRAM_CHIP_SIZE=512 diff --git a/configs/tx6u-80x0_defconfig b/configs/tx6u-80x0_defconfig index c3e7ab4a4e..cd28f7b599 100644 --- a/configs/tx6u-80x0_defconfig +++ b/configs/tx6u-80x0_defconfig @@ -33,3 +33,4 @@ CONFIG_NET=y CONFIG_NETDEVICES=y CONFIG_PHY_SMSC=y CONFIG_SYS_PROMPT="TX6DL U-Boot > " +CONFIG_SYS_SDRAM_CHIP_SIZE=512 diff --git a/configs/tx6u-80x0_mfg_defconfig b/configs/tx6u-80x0_mfg_defconfig index 251f242ab2..a0e422ebd5 100644 --- a/configs/tx6u-80x0_mfg_defconfig +++ b/configs/tx6u-80x0_mfg_defconfig @@ -32,3 +32,4 @@ CONFIG_NET=y CONFIG_NETDEVICES=y CONFIG_PHY_SMSC=y CONFIG_SYS_PROMPT="TX6DL U-Boot > " +CONFIG_SYS_SDRAM_CHIP_SIZE=512 diff --git a/configs/tx6u-80x0_noenv_defconfig b/configs/tx6u-80x0_noenv_defconfig index d09a795da2..0b50a79e93 100644 --- a/configs/tx6u-80x0_noenv_defconfig +++ b/configs/tx6u-80x0_noenv_defconfig @@ -32,3 +32,4 @@ CONFIG_NET=y CONFIG_NETDEVICES=y CONFIG_PHY_SMSC=y CONFIG_SYS_PROMPT="TX6DL U-Boot > " +CONFIG_SYS_SDRAM_CHIP_SIZE=512 diff --git a/configs/tx6u-80x0_sec_defconfig b/configs/tx6u-80x0_sec_defconfig index 649bb67ef1..e045c555e9 100644 --- a/configs/tx6u-80x0_sec_defconfig +++ b/configs/tx6u-80x0_sec_defconfig @@ -34,3 +34,4 @@ CONFIG_NET=y CONFIG_NETDEVICES=y CONFIG_PHY_SMSC=y CONFIG_SYS_PROMPT="TX6DL U-Boot > " +CONFIG_SYS_SDRAM_CHIP_SIZE=512 diff --git a/configs/tx6u-8111_defconfig b/configs/tx6u-8111_defconfig index aece892112..b4b7090563 100644 --- a/configs/tx6u-8111_defconfig +++ b/configs/tx6u-8111_defconfig @@ -34,3 +34,4 @@ CONFIG_NET=y CONFIG_NETDEVICES=y CONFIG_PHY_SMSC=y CONFIG_SYS_PROMPT="TX6DL U-Boot > " +CONFIG_SYS_SDRAM_CHIP_SIZE=512 diff --git a/configs/tx6u-8111_mfg_defconfig b/configs/tx6u-8111_mfg_defconfig index f141f412d5..2adc272733 100644 --- a/configs/tx6u-8111_mfg_defconfig +++ b/configs/tx6u-8111_mfg_defconfig @@ -33,3 +33,4 @@ CONFIG_NET=y CONFIG_NETDEVICES=y CONFIG_PHY_SMSC=y CONFIG_SYS_PROMPT="TX6DL U-Boot > " +CONFIG_SYS_SDRAM_CHIP_SIZE=512 diff --git a/configs/tx6u-8111_noenv_defconfig b/configs/tx6u-8111_noenv_defconfig index 7b19fd27c1..5329690674 100644 --- a/configs/tx6u-8111_noenv_defconfig +++ b/configs/tx6u-8111_noenv_defconfig @@ -33,3 +33,4 @@ CONFIG_NET=y CONFIG_NETDEVICES=y CONFIG_PHY_SMSC=y CONFIG_SYS_PROMPT="TX6DL U-Boot > " +CONFIG_SYS_SDRAM_CHIP_SIZE=512 diff --git a/configs/tx6u-8111_sec_defconfig b/configs/tx6u-8111_sec_defconfig index 1d60a580e6..cc03891281 100644 --- a/configs/tx6u-8111_sec_defconfig +++ b/configs/tx6u-8111_sec_defconfig @@ -34,3 +34,4 @@ CONFIG_NET=y CONFIG_NETDEVICES=y CONFIG_PHY_SMSC=y CONFIG_SYS_PROMPT="TX6DL U-Boot > " +CONFIG_SYS_SDRAM_CHIP_SIZE=512 diff --git a/configs/tx6u-81x0_defconfig b/configs/tx6u-81x0_defconfig index 208900ec4f..bdc74287fa 100644 --- a/configs/tx6u-81x0_defconfig +++ b/configs/tx6u-81x0_defconfig @@ -34,3 +34,4 @@ CONFIG_NET=y CONFIG_NETDEVICES=y CONFIG_PHY_SMSC=y CONFIG_SYS_PROMPT="TX6DL U-Boot > " +CONFIG_SYS_SDRAM_CHIP_SIZE=512 diff --git a/configs/tx6u-81x0_mfg_defconfig b/configs/tx6u-81x0_mfg_defconfig index 95d47e6450..c0e8e5f7c2 100644 --- a/configs/tx6u-81x0_mfg_defconfig +++ b/configs/tx6u-81x0_mfg_defconfig @@ -33,3 +33,4 @@ CONFIG_NET=y CONFIG_NETDEVICES=y CONFIG_PHY_SMSC=y CONFIG_SYS_PROMPT="TX6DL U-Boot > " +CONFIG_SYS_SDRAM_CHIP_SIZE=512 diff --git a/configs/tx6u-81x0_noenv_defconfig b/configs/tx6u-81x0_noenv_defconfig index 84828baccd..357face9bf 100644 --- a/configs/tx6u-81x0_noenv_defconfig +++ b/configs/tx6u-81x0_noenv_defconfig @@ -33,3 +33,4 @@ CONFIG_NET=y CONFIG_NETDEVICES=y CONFIG_PHY_SMSC=y CONFIG_SYS_PROMPT="TX6DL U-Boot > " +CONFIG_SYS_SDRAM_CHIP_SIZE=512 diff --git a/configs/tx6u-81x0_sec_defconfig b/configs/tx6u-81x0_sec_defconfig index bc34f3a56e..c1988c2c06 100644 --- a/configs/tx6u-81x0_sec_defconfig +++ b/configs/tx6u-81x0_sec_defconfig @@ -34,3 +34,4 @@ CONFIG_NET=y CONFIG_NETDEVICES=y CONFIG_PHY_SMSC=y CONFIG_SYS_PROMPT="TX6DL U-Boot > " +CONFIG_SYS_SDRAM_CHIP_SIZE=512 diff --git a/configs/tx6ul-0010_defconfig b/configs/tx6ul-0010_defconfig index 064cc9577e..b03ffb1f74 100644 --- a/configs/tx6ul-0010_defconfig +++ b/configs/tx6ul-0010_defconfig @@ -32,3 +32,4 @@ CONFIG_NET=y CONFIG_NETDEVICES=y CONFIG_PHY_SMSC=y CONFIG_SYS_PROMPT="TX6UL U-Boot > " +CONFIG_SYS_SDRAM_CHIP_SIZE=512 diff --git a/configs/tx6ul-0010_mfg_defconfig b/configs/tx6ul-0010_mfg_defconfig index e2c3e4930d..988e3eead2 100644 --- a/configs/tx6ul-0010_mfg_defconfig +++ b/configs/tx6ul-0010_mfg_defconfig @@ -31,3 +31,4 @@ CONFIG_NET=y CONFIG_NETDEVICES=y CONFIG_PHY_SMSC=y CONFIG_SYS_PROMPT="TX6UL U-Boot > " +CONFIG_SYS_SDRAM_CHIP_SIZE=512 diff --git a/configs/tx6ul-0010_noenv_defconfig b/configs/tx6ul-0010_noenv_defconfig index b702a4fee9..5d523058a3 100644 --- a/configs/tx6ul-0010_noenv_defconfig +++ b/configs/tx6ul-0010_noenv_defconfig @@ -31,3 +31,4 @@ CONFIG_NET=y CONFIG_NETDEVICES=y CONFIG_PHY_SMSC=y CONFIG_SYS_PROMPT="TX6UL U-Boot > " +CONFIG_SYS_SDRAM_CHIP_SIZE=512 diff --git a/configs/tx6ul-0010_sec_defconfig b/configs/tx6ul-0010_sec_defconfig index 721997e764..27d8df0547 100644 --- a/configs/tx6ul-0010_sec_defconfig +++ b/configs/tx6ul-0010_sec_defconfig @@ -33,3 +33,4 @@ CONFIG_NET=y CONFIG_NETDEVICES=y CONFIG_PHY_SMSC=y CONFIG_SYS_PROMPT="TX6UL U-Boot > " +CONFIG_SYS_SDRAM_CHIP_SIZE=512 diff --git a/configs/tx6ul-0011_defconfig b/configs/tx6ul-0011_defconfig index da0ef0f0e9..34fc697696 100644 --- a/configs/tx6ul-0011_defconfig +++ b/configs/tx6ul-0011_defconfig @@ -29,3 +29,4 @@ CONFIG_NET=y CONFIG_NETDEVICES=y CONFIG_PHY_SMSC=y CONFIG_SYS_PROMPT="TX6UL U-Boot > " +CONFIG_SYS_SDRAM_CHIP_SIZE=512 diff --git a/configs/tx6ul-0011_mfg_defconfig b/configs/tx6ul-0011_mfg_defconfig index 9180483b98..6c9b3c14b0 100644 --- a/configs/tx6ul-0011_mfg_defconfig +++ b/configs/tx6ul-0011_mfg_defconfig @@ -28,3 +28,4 @@ CONFIG_NET=y CONFIG_NETDEVICES=y CONFIG_PHY_SMSC=y CONFIG_SYS_PROMPT="TX6UL U-Boot > " +CONFIG_SYS_SDRAM_CHIP_SIZE=512 diff --git a/configs/tx6ul-0011_noenv_defconfig b/configs/tx6ul-0011_noenv_defconfig index 10c1322680..dac05c9f31 100644 --- a/configs/tx6ul-0011_noenv_defconfig +++ b/configs/tx6ul-0011_noenv_defconfig @@ -28,3 +28,4 @@ CONFIG_NET=y CONFIG_NETDEVICES=y CONFIG_PHY_SMSC=y CONFIG_SYS_PROMPT="TX6UL U-Boot > " +CONFIG_SYS_SDRAM_CHIP_SIZE=512 diff --git a/configs/tx6ul-0011_sec_defconfig b/configs/tx6ul-0011_sec_defconfig index acff41a8d4..63f4154130 100644 --- a/configs/tx6ul-0011_sec_defconfig +++ b/configs/tx6ul-0011_sec_defconfig @@ -29,3 +29,4 @@ CONFIG_NET=y CONFIG_NETDEVICES=y CONFIG_PHY_SMSC=y CONFIG_SYS_PROMPT="TX6UL U-Boot > " +CONFIG_SYS_SDRAM_CHIP_SIZE=512 diff --git a/include/configs/tx6.h b/include/configs/tx6.h index 71a3d71b2b..9c755ddf03 100644 --- a/include/configs/tx6.h +++ b/include/configs/tx6.h @@ -86,7 +86,20 @@ #define CONFIG_SYS_SDRAM_BUS_WIDTH 64 #endif #endif /* CONFIG_SYS_SDRAM_BUS_WIDTH */ -#define PHYS_SDRAM_1_SIZE (SZ_512M / 32 * CONFIG_SYS_SDRAM_BUS_WIDTH) +#ifdef __ASSEMBLY__ +#define _AC(x,s) x +#else +#define _AC(x,s) (x##s) +#endif +#define UL(x) _AC(x,UL) +#define PHYS_SDRAM_1_SIZE (UL(CONFIG_SYS_SDRAM_CHIP_SIZE) * SZ_1M \ + / 32 * CONFIG_SYS_SDRAM_BUS_WIDTH) +#if PHYS_SDRAM_1_SIZE > SZ_1G +#define FDT_HIGH_STR "fdt_high=ffffffff\0" +#else +#define FDT_HIGH_STR "" +#endif + #ifdef CONFIG_SOC_MX6Q #define CONFIG_SYS_SDRAM_CLK 528 #else @@ -215,6 +228,7 @@ EMMC_BOOT_PART_STR \ EMMC_BOOT_ACK_STR \ "fdtaddr=" xstr(CONFIG_FDTADDR) "\0" \ + FDT_HIGH_STR \ FDTSAVE_CMD_STR \ "mtdids=" MTDIDS_DEFAULT "\0" \ "mtdparts=" MTDPARTS_DEFAULT "\0" \ -- 2.39.2