diff options
Diffstat (limited to 'package/boot/uboot-kirkwood/patches/010-pogoplug_v4.patch')
| -rw-r--r-- | package/boot/uboot-kirkwood/patches/010-pogoplug_v4.patch | 91 |
1 files changed, 21 insertions, 70 deletions
diff --git a/package/boot/uboot-kirkwood/patches/010-pogoplug_v4.patch b/package/boot/uboot-kirkwood/patches/010-pogoplug_v4.patch index d2daf0b66f..50551bad6a 100644 --- a/package/boot/uboot-kirkwood/patches/010-pogoplug_v4.patch +++ b/package/boot/uboot-kirkwood/patches/010-pogoplug_v4.patch @@ -3,13 +3,13 @@ @@ -25,6 +25,9 @@ config TARGET_LSXL config TARGET_POGO_E02 bool "pogo_e02 Board" - + +config TARGET_POGOPLUGV4 + bool "Pogoplug V4 Board" + config TARGET_DNS325 bool "dns325 Board" - + @@ -77,6 +80,7 @@ source "board/Marvell/guruplug/Kconfig" source "board/Marvell/sheevaplug/Kconfig" source "board/buffalo/lsxl/Kconfig" @@ -18,49 +18,15 @@ source "board/d-link/dns325/Kconfig" source "board/iomega/iconnect/Kconfig" source "board/keymile/km_arm/Kconfig" ---- a/arch/arm/mach-kirkwood/include/mach/config.h -+++ b/arch/arm/mach-kirkwood/include/mach/config.h -@@ -77,6 +77,7 @@ - * Ethernet Driver configuration - */ - #ifdef CONFIG_CMD_NET -+#define CONFIG_FEATURE_COMMAND_EDITING - #define CONFIG_NETCONSOLE /* include NetConsole support */ - #define CONFIG_MII /* expose smi ove miiphy interface */ - #define CONFIG_MVGBE /* Enable Marvell Gbe Controller Driver */ -@@ -110,6 +111,7 @@ - #define CONFIG_SYS_ATA_STRIDE 4 - /* Controller supports 48-bits LBA addressing */ - #define CONFIG_LBA48 -+#define CONFIG_SYS_64BIT_LBA - /* CONFIG_IDE requires some #defines for ATA registers */ - #define CONFIG_SYS_IDE_MAXBUS 2 - #define CONFIG_SYS_IDE_MAXDEVICE 2 -@@ -134,4 +136,15 @@ - #define CONFIG_SYS_TIMER_COUNTER (MVEBU_TIMER_BASE + 0x14) - #define CONFIG_SYS_TIMER_RATE CONFIG_SYS_TCLK - -+/* -+ * Boot option -+ */ -+#define CONFIG_CMD_BOOTZ -+ -+/* -+ * GPIO -+ */ -+#define CONFIG_CMD_GPIO -+#define CONFIG_KIRKWOOD_GPIO -+ - #endif /* _KW_CONFIG_H */ --- a/arch/arm/mach-kirkwood/include/mach/kw88f6192.h +++ b/arch/arm/mach-kirkwood/include/mach/kw88f6192.h @@ -16,6 +16,6 @@ #define KW_REGS_PHY_BASE KW88F6192_REGS_PHYS_BASE - + /* TCLK Core Clock defination */ -#define CONFIG_SYS_TCLK 166000000 /* 166MHz */ +#define CONFIG_SYS_TCLK 166666667 /* 166MHz */ - + #endif /* _CONFIG_KW88F6192_H */ --- a/arch/arm/mach-kirkwood/include/mach/mpp.h +++ b/arch/arm/mach-kirkwood/include/mach/mpp.h @@ -69,25 +35,14 @@ #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 ) +#define MPP33_SATA1_ACTn MPP( 33, 0x5, 0, 1, 0, 1, 1, 1 ) - + #define MPP34_GPIO MPP( 34, 0x0, 1, 1, 0, 1, 1, 1 ) #define MPP34_TDM_SPI_CS1 MPP( 34, 0x2, 0, 1, 0, 0, 1, 1 ) #define MPP34_GE1_14 MPP( 34, 0x3, 0, 0, 0, 1, 1, 1 ) +#define MPP34_SATA1_ACTn MPP( 34, 0x5, 0, 1, 0, 1, 1, 1 ) - + #define MPP35_GPIO MPP( 35, 0x0, 1, 1, 1, 1, 1, 1 ) #define MPP35_TDM_CH0_TX_QL MPP( 35, 0x2, 0, 1, 0, 0, 1, 1 ) ---- a/arch/arm/mach-mvebu/include/mach/soc.h -+++ b/arch/arm/mach-mvebu/include/mach/soc.h -@@ -18,6 +18,8 @@ - #define SOC_88F6810_ID 0x6810 - #define SOC_88F6820_ID 0x6820 - #define SOC_88F6828_ID 0x6828 -+#define SOC_88F6192_ID 0x6192 -+#define SOC_88F6702_ID 0x6702 - - /* A375 revisions */ - #define MV_88F67XX_A0_ID 0x3 --- /dev/null +++ b/board/cloudengines/pogoplugv4/Kconfig @@ -0,0 +1,12 @@ @@ -577,9 +532,10 @@ +#endif /* __POGOPLUGV4_H */ --- /dev/null +++ b/configs/pogoplugv4_defconfig -@@ -0,0 +1,35 @@ +@@ -0,0 +1,40 @@ +CONFIG_ARM=y +CONFIG_KIRKWOOD=y ++CONFIG_SYS_TEXT_BASE=0x600000 +CONFIG_TARGET_POGOPLUGV4=y +CONFIG_SYS_PROMPT="pogoplugv4> " +CONFIG_IDENT_STRING="\nPogoplug V4" @@ -589,6 +545,7 @@ +CONFIG_SYS_NS16550=y +CONFIG_CMD_FDT=y +CONFIG_OF_LIBFDT=y ++CONFIG_OF_BOOTZ=y +CONFIG_CMD_SETEXPR=y +CONFIG_CMD_DHCP=y +CONFIG_CMD_MII=y @@ -601,10 +558,12 @@ +CONFIG_CMD_EXT4=y +CONFIG_CMD_FAT=y +CONFIG_CMD_JFFS2=y ++CONFIG_MTDPARTS_DEFAULT="mtdparts=orion_nand:0x1c0000(uboot),0x40000(uboot_env),0x7e00000(ubi)" +CONFIG_CMD_MTDPARTS=y +CONFIG_CMD_ENV=y +CONFIG_CMD_NAND=y +CONFIG_CMD_MMC=y ++CONFIG_CMD_GPIO=y +CONFIG_EFI_PARTITION=y +CONFIG_ENV_IS_IN_NAND=y +CONFIG_CMD_UBI=y @@ -613,6 +572,7 @@ +CONFIG_USB_STORAGE=y +CONFIG_LZMA=y +CONFIG_LZO=y ++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 @@ -659,7 +619,7 @@ obj-$(CONFIG_MMC_SDHCI_XENON) += xenon_sdhci.o obj-$(CONFIG_MMC_SDHCI_ZYNQ) += zynq_sdhci.o +obj-$(CONFIG_KIRKWOOD_MMC) += kirkwood_mmc.o - + obj-$(CONFIG_MMC_SUNXI) += sunxi_mmc.o obj-$(CONFIG_MMC_UNIPHIER) += uniphier-sd.o --- /dev/null @@ -1149,26 +1109,20 @@ +} --- a/include/configs/mv-common.h +++ b/include/configs/mv-common.h -@@ -130,4 +130,16 @@ +@@ -117,4 +117,10 @@ #define CONFIG_MTD_PARTITIONS #endif - + +/* + * Kirkwood MMC + */ +#if defined(CONFIG_KIRKWOOD) && defined(CONFIG_CMD_MMC) +#define CONFIG_SYS_MMC_BASE KW_SDIO_BASE +#endif /* defined(CONFIG_KIRKWOOD) && defined(CONFIG_CMD_MMC) */ -+ -+/* -+ * GPIO command for all Kirkwood boxes -+ */ -+#define CONFIG_CMD_GPIO -+ #endif /* _MV_COMMON_H */ --- /dev/null +++ b/include/configs/pogoplugv4.h -@@ -0,0 +1,132 @@ +@@ -0,0 +1,129 @@ +/* + * Copyright (C) 2014-2016 bodhi <mibodhi@gmail.com> + * Based on @@ -1214,11 +1168,14 @@ +#define CONFIG_KW88F6192 /* SOC Name */ +#define CONFIG_SKIP_LOWLEVEL_INIT /* disable board lowlevel_init */ + ++#define CONFIG_FEATURE_COMMAND_EDITING ++#define CONFIG_SYS_64BIT_LBA ++ +/* + * Commands configuration + */ + -+#define CONFIG_SYS_LONGHELP ++#define CONFIG_KIRKWOOD_GPIO +#define CONFIG_PREBOOT + +/* @@ -1252,16 +1209,10 @@ + "ubi read 0x800000 kernel; " \ + "bootm 0x800000" + -+#define CONFIG_MTDPARTS \ -+ "mtdparts=orion_nand:" \ -+ "0x1c0000(uboot)," \ -+ "0x40000(uboot_env)," \ -+ "0x7e00000(ubi)\0" -+ +#define CONFIG_EXTRA_ENV_SETTINGS \ + "console=console=ttyS0,115200\0" \ + "mtdids=nand0=orion_nand\0" \ -+ "mtdparts="CONFIG_MTDPARTS \ ++ "mtdparts="CONFIG_MTDPARTS_DEFAULT \ + "bootargs_root=\0" + +/* |