uboot-kirkwood: update to 2019.01

[openwrt/staging/wigyori.git] / package / boot / uboot-kirkwood / patches / 010-pogoplug_v4.patch

diff --git a/package/boot/uboot-kirkwood/patches/010-pogoplug_v4.patch b/package/boot/uboot-kirkwood/patches/010-pogoplug_v4.patch
index 568c8bf5f0560cf5670532e2ff91cc626caff419..8aed96ad18c86228b656b61d956e2448331bb012 100644 (file)
--- a/package/boot/uboot-kirkwood/patches/010-pogoplug_v4.patch
+++ b/package/boot/uboot-kirkwood/patches/010-pogoplug_v4.patch
@@ -10,7 +10,7 @@
  config TARGET_DNS325
        bool "dns325 Board"
 
-@@ -77,6 +80,7 @@ source "board/Marvell/guruplug/Kconfig"
+@@ -83,6 +86,7 @@ source "board/Marvell/guruplug/Kconfig"
  source "board/Marvell/sheevaplug/Kconfig"
  source "board/buffalo/lsxl/Kconfig"
  source "board/cloudengines/pogo_e02/Kconfig"
@@ -20,7 +20,7 @@
  source "board/keymile/km_arm/Kconfig"
 --- a/arch/arm/mach-kirkwood/include/mach/kw88f6192.h
 +++ b/arch/arm/mach-kirkwood/include/mach/kw88f6192.h
-@@ -16,6 +16,6 @@
+@@ -15,6 +15,6 @@
  #define KW_REGS_PHY_BASE              KW88F6192_REGS_PHYS_BASE
 
  /* TCLK Core Clock defination */
@@ -30,7 +30,7 @@
  #endif /* _CONFIG_KW88F6192_H */
 --- a/arch/arm/mach-kirkwood/include/mach/mpp.h
 +++ b/arch/arm/mach-kirkwood/include/mach/mpp.h
-@@ -217,10 +217,12 @@
+@@ -216,10 +216,12 @@
  #define MPP33_GPIO            MPP( 33, 0x0, 1, 1, 0,   1,   1,   1    )
  #define MPP33_TDM_DTX         MPP( 33, 0x2, 0, 1, 0,   0,   1,   1    )
  #define MPP33_GE1_13          MPP( 33, 0x3, 0, 0, 0,   1,   1,   1    )
@@ -532,16 +532,19 @@
 +#endif /* __POGOPLUGV4_H */
 --- /dev/null
 +++ b/configs/pogoplugv4_defconfig
-@@ -0,0 +1,40 @@
+@@ -0,0 +1,43 @@
 +CONFIG_ARM=y
 +CONFIG_KIRKWOOD=y
 +CONFIG_SYS_TEXT_BASE=0x600000
 +CONFIG_TARGET_POGOPLUGV4=y
 +CONFIG_SYS_PROMPT="pogoplugv4> "
 +CONFIG_IDENT_STRING="\nPogoplug V4"
++CONFIG_NR_DRAM_BANKS=2
 +CONFIG_BOOTDELAY=3
 +# CONFIG_CMD_IMLS is not set
 +# CONFIG_CMD_FLASH is not set
++CONFIG_MVGBE=y
++CONFIG_MII=y
 +CONFIG_SYS_NS16550=y
 +CONFIG_CMD_FDT=y
 +CONFIG_OF_LIBFDT=y
@@ -575,7 +578,7 @@
 +CONFIG_SYS_LONGHELP=y
 --- a/drivers/gpio/kw_gpio.c
 +++ b/drivers/gpio/kw_gpio.c
-@@ -148,3 +148,36 @@ void kw_gpio_set_blink(unsigned pin, int
+@@ -147,3 +147,36 @@ void kw_gpio_set_blink(unsigned pin, int
        /* Set blinking. */
        __set_blinking(pin, blink);
  }
@@ -621,7 +624,7 @@
 +obj-$(CONFIG_KIRKWOOD_MMC)            += kirkwood_mmc.o
 
  obj-$(CONFIG_MMC_SUNXI)                       += sunxi_mmc.o
- obj-$(CONFIG_MMC_UNIPHIER)            += uniphier-sd.o
+ obj-$(CONFIG_MMC_UNIPHIER)            += tmio-common.o uniphier-sd.o
 --- /dev/null
 +++ b/drivers/mmc/kirkwood_mmc.c
 @@ -0,0 +1,482 @@
@@ -1109,8 +1112,8 @@
 +}
 --- a/include/configs/mv-common.h
 +++ b/include/configs/mv-common.h
-@@ -117,4 +117,10 @@
- #define CONFIG_MTD_PARTITIONS
+@@ -77,4 +77,10 @@
+ #define CONFIG_SYS_MAX_NAND_DEVICE     1
  #endif
 
 +/*
@@ -1122,7 +1125,7 @@
  #endif /* _MV_COMMON_H */
 --- /dev/null
 +++ b/include/configs/pogoplugv4.h
-@@ -0,0 +1,129 @@
+@@ -0,0 +1,127 @@
 +/*
 + * Copyright (C) 2014-2016 bodhi <mibodhi@gmail.com>
 + * Based on
@@ -1229,8 +1232,6 @@
 + */
 +#define CONFIG_JFFS2_NAND
 +#define CONFIG_JFFS2_LZO
-+#define CONFIG_MTD_DEVICE               /* needed for mtdparts commands */
-+#define CONFIG_MTD_PARTITIONS
 +
 +/*
 + * SATA