Merge git://git.denx.de/u-boot-socfpga

[platform/kernel/u-boot.git] / arch / arm / mach-uniphier / boards.c

diff --git a/arch/arm/mach-uniphier/boards.c b/arch/arm/mach-uniphier/boards.c
index db7d192..78de256 100644 (file)
--- a/arch/arm/mach-uniphier/boards.c
+++ b/arch/arm/mach-uniphier/boards.c
@@ -140,69 +140,6 @@ static const struct uniphier_board_data uniphier_ld6b_data = {
 };
 #endif
 
-#if defined(CONFIG_ARCH_UNIPHIER_LD11)
-static const struct uniphier_board_data uniphier_ld11_data = {
-       .dram_freq = 1600,
-       .dram_ch[0] = {
-               .size = 0x20000000,
-               .width = 16,
-       },
-       .dram_ch[1] = {
-               .size = 0x20000000,
-               .width = 16,
-       },
-};
-#endif
-
-#if defined(CONFIG_ARCH_UNIPHIER_LD20)
-static const struct uniphier_board_data uniphier_ld20_ref_data = {
-       .dram_freq = 1866,
-       .dram_ch[0] = {
-               .size = 0x40000000,
-               .width = 32,
-       },
-       .dram_ch[1] = {
-               .size = 0x40000000,
-               .width = 32,
-       },
-       .dram_ch[2] = {
-               .size = 0x40000000,
-               .width = 32,
-       },
-       .flags = UNIPHIER_BD_BOARD_LD20_REF,
-};
-
-static const struct uniphier_board_data uniphier_ld20_data = {
-       .dram_freq = 1866,
-       .dram_ch[0] = {
-               .size = 0x40000000,
-               .width = 32,
-       },
-       .dram_ch[1] = {
-               .size = 0x40000000,
-               .width = 32,
-       },
-       .dram_ch[2] = {
-               .size = 0x40000000,
-               .width = 32,
-       },
-       .flags = UNIPHIER_BD_BOARD_LD20_GLOBAL,
-};
-
-static const struct uniphier_board_data uniphier_ld21_data = {
-       .dram_freq = 1866,
-       .dram_ch[0] = {
-               .size = 0x20000000,
-               .width = 32,
-       },
-       .dram_ch[1] = {
-               .size = 0x40000000,
-               .width = 32,
-       },
-       .flags = UNIPHIER_BD_BOARD_LD21_GLOBAL,
-};
-#endif
-
 struct uniphier_board_id {
        const char *compatible;
        const struct uniphier_board_data *param;
@@ -232,14 +169,6 @@ static const struct uniphier_board_id uniphier_boards[] = {
 #if defined(CONFIG_ARCH_UNIPHIER_LD6B)
        { "socionext,uniphier-ld6b", &uniphier_ld6b_data, },
 #endif
-#if defined(CONFIG_ARCH_UNIPHIER_LD11)
-       { "socionext,uniphier-ld11", &uniphier_ld11_data, },
-#endif
-#if defined(CONFIG_ARCH_UNIPHIER_LD20)
-       { "socionext,uniphier-ld21", &uniphier_ld21_data, },
-       { "socionext,uniphier-ld20-ref", &uniphier_ld20_ref_data, },
-       { "socionext,uniphier-ld20", &uniphier_ld20_data, },
-#endif
 };
 
 const struct uniphier_board_data *uniphier_get_board_param(void)