From 6cafea5c5ea92be0152f475467a2434c90d01891 Mon Sep 17 00:00:00 2001 From: Pawel Dembicki Date: Sat, 11 Apr 2020 15:44:14 +0200 Subject: uboot-kirkwood: update to 2020.04 Update U-Boot to current 2020.04 release for kirkwood platform. Catch up with upstream and move some configuration options from the header files to the corresponding defconfig files. Compile tested: all devices Run tested: nsa310, pogoplugv4 Tested-by: Cezary Jackiewicz [nsa310] Signed-off-by: Pawel Dembicki --- .../uboot-kirkwood/patches/010-pogoplug_v4.patch | 32 +++++++++------------- 1 file changed, 13 insertions(+), 19 deletions(-) (limited to '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 8aed96ad18..58bf664238 100644 --- a/package/boot/uboot-kirkwood/patches/010-pogoplug_v4.patch +++ b/package/boot/uboot-kirkwood/patches/010-pogoplug_v4.patch @@ -17,7 +17,7 @@ +source "board/cloudengines/pogoplugv4/Kconfig" source "board/d-link/dns325/Kconfig" source "board/iomega/iconnect/Kconfig" - source "board/keymile/km_arm/Kconfig" + source "board/keymile/Kconfig" --- a/arch/arm/mach-kirkwood/include/mach/kw88f6192.h +++ b/arch/arm/mach-kirkwood/include/mach/kw88f6192.h @@ -15,6 +15,6 @@ @@ -532,8 +532,10 @@ +#endif /* __POGOPLUGV4_H */ --- /dev/null +++ b/configs/pogoplugv4_defconfig -@@ -0,0 +1,43 @@ +@@ -0,0 +1,51 @@ +CONFIG_ARM=y ++CONFIG_SYS_DCACHE_OFF=y ++CONFIG_ARCH_CPU_INIT=y +CONFIG_KIRKWOOD=y +CONFIG_SYS_TEXT_BASE=0x600000 +CONFIG_TARGET_POGOPLUGV4=y @@ -561,6 +563,8 @@ +CONFIG_CMD_EXT4=y +CONFIG_CMD_FAT=y +CONFIG_CMD_JFFS2=y ++CONFIG_MTD=y ++CONFIG_MTD_RAW_NAND=y +CONFIG_MTDPARTS_DEFAULT="mtdparts=orion_nand:0x1c0000(uboot),0x40000(uboot_env),0x7e00000(ubi)" +CONFIG_CMD_MTDPARTS=y +CONFIG_CMD_ENV=y @@ -569,6 +573,10 @@ +CONFIG_CMD_GPIO=y +CONFIG_EFI_PARTITION=y +CONFIG_ENV_IS_IN_NAND=y ++CONFIG_ENV_SIZE=0x20000 ++CONFIG_ENV_OFFSET=0x1C0000 ++CONFIG_ENV_SECT_SIZE=0x20000 ++CONFIG_ENV_ADDR=0x1C0000 +CONFIG_CMD_UBI=y +CONFIG_USB=y +CONFIG_USB_EHCI_HCD=y @@ -617,7 +625,7 @@ +} --- a/drivers/mmc/Makefile +++ b/drivers/mmc/Makefile -@@ -61,6 +61,7 @@ obj-$(CONFIG_MMC_SDHCI_TANGIER) += tang +@@ -66,6 +66,7 @@ obj-$(CONFIG_MMC_SDHCI_TANGIER) += tang obj-$(CONFIG_MMC_SDHCI_TEGRA) += tegra_mmc.o obj-$(CONFIG_MMC_SDHCI_XENON) += xenon_sdhci.o obj-$(CONFIG_MMC_SDHCI_ZYNQ) += zynq_sdhci.o @@ -1112,7 +1120,7 @@ +} --- a/include/configs/mv-common.h +++ b/include/configs/mv-common.h -@@ -77,4 +77,10 @@ +@@ -75,4 +75,10 @@ #define CONFIG_SYS_MAX_NAND_DEVICE 1 #endif @@ -1125,7 +1133,7 @@ #endif /* _MV_COMMON_H */ --- /dev/null +++ b/include/configs/pogoplugv4.h -@@ -0,0 +1,127 @@ +@@ -0,0 +1,113 @@ +/* + * Copyright (C) 2014-2016 bodhi + * Based on @@ -1188,20 +1196,6 @@ +#include "mv-common.h" + +/* -+ * Environment variables configurations -+ */ -+#ifdef CONFIG_CMD_NAND -+ -+#define CONFIG_ENV_SECT_SIZE 0x20000 /* 128K */ -+ -+ -+#endif -+ -+#define CONFIG_ENV_SIZE 0x20000 /* 128k */ -+#define CONFIG_ENV_ADDR 0x1c0000 -+#define CONFIG_ENV_OFFSET 0x1c0000 /* env starts here */ -+ -+/* + * Default environment variables + */ +#define CONFIG_BOOTCOMMAND \ -- cgit v1.2.3