diff options
Diffstat (limited to 'target/linux/orion/patches')
4 files changed, 8 insertions, 62 deletions
diff --git a/target/linux/orion/patches/200-dt2_board_support.patch b/target/linux/orion/patches/200-dt2_board_support.patch index 91909ab..a6606d5 100644 --- a/target/linux/orion/patches/200-dt2_board_support.patch +++ b/target/linux/orion/patches/200-dt2_board_support.patch @@ -1,6 +1,6 @@ --- a/arch/arm/mach-orion5x/Kconfig +++ b/arch/arm/mach-orion5x/Kconfig -@@ -16,6 +16,13 @@ config MACH_RD88F5182 +@@ -23,6 +23,13 @@ config MACH_RD88F5182 Say 'Y' here if you want your kernel to support the Marvell Orion-NAS (88F5182) RD2 @@ -16,7 +16,7 @@ select I2C_BOARDINFO --- a/arch/arm/mach-orion5x/Makefile +++ b/arch/arm/mach-orion5x/Makefile -@@ -18,6 +18,7 @@ obj-$(CONFIG_MACH_BIGDISK) += d2net-setu +@@ -17,6 +17,7 @@ obj-$(CONFIG_MACH_BIGDISK) += d2net-setu obj-$(CONFIG_MACH_NET2BIG) += net2big-setup.o obj-$(CONFIG_MACH_MSS2) += mss2-setup.o obj-$(CONFIG_MACH_WNR854T) += wnr854t-setup.o diff --git a/target/linux/orion/patches/210-wn802t_support.patch b/target/linux/orion/patches/210-wn802t_support.patch index 7fd908b..bf1e868 100644 --- a/target/linux/orion/patches/210-wn802t_support.patch +++ b/target/linux/orion/patches/210-wn802t_support.patch @@ -1,6 +1,6 @@ --- a/arch/arm/mach-orion5x/Kconfig +++ b/arch/arm/mach-orion5x/Kconfig -@@ -139,10 +139,13 @@ config MACH_MSS2 +@@ -146,10 +146,13 @@ config MACH_MSS2 Maxtor Shared Storage II platform. config MACH_WNR854T @@ -47,8 +47,8 @@ + orion5x_uart0_init(); - orion5x_setup_dev_boot_win(WNR854T_NOR_BOOT_BASE, -@@ -167,7 +181,7 @@ static struct hw_pci wnr854t_pci __initd + mvebu_mbus_add_window("devbus-boot", WNR854T_NOR_BOOT_BASE, +@@ -166,7 +180,7 @@ static struct hw_pci wnr854t_pci __initd static int __init wnr854t_pci_init(void) { @@ -57,14 +57,14 @@ pci_common_init(&wnr854t_pci); return 0; -@@ -178,6 +192,18 @@ MACHINE_START(WNR854T, "Netgear WNR854T" +@@ -177,6 +191,18 @@ MACHINE_START(WNR854T, "Netgear WNR854T" /* Maintainer: Imre Kaloz <kaloz@openwrt.org> */ .atag_offset = 0x100, .init_machine = wnr854t_init, + .map_io = orion5x_map_io, + .init_early = orion5x_init_early, + .init_irq = orion5x_init_irq, -+ .timer = &orion5x_timer, ++ .init_time = orion5x_timer_init, + .fixup = tag_fixup_mem32, + .restart = orion5x_restart, +MACHINE_END diff --git a/target/linux/orion/patches/400-fix-section-mismatch-warnings.patch b/target/linux/orion/patches/400-fix-section-mismatch-warnings.patch index 84ca91f..f0685d3 100644 --- a/target/linux/orion/patches/400-fix-section-mismatch-warnings.patch +++ b/target/linux/orion/patches/400-fix-section-mismatch-warnings.patch @@ -1,6 +1,6 @@ --- a/arch/arm/mach-orion5x/common.c +++ b/arch/arm/mach-orion5x/common.c -@@ -192,7 +192,7 @@ void __init orion5x_init_early(void) +@@ -242,7 +242,7 @@ void orion5x_setup_wins(void) int orion5x_tclk; @@ -9,23 +9,3 @@ { u32 dev, rev; -@@ -204,7 +204,7 @@ int __init orion5x_find_tclk(void) - return 166666667; - } - --static void orion5x_timer_init(void) -+static __init void orion5x_timer_init(void) - { - orion5x_tclk = orion5x_find_tclk(); - ---- a/arch/arm/mach-orion5x/addr-map.c -+++ b/arch/arm/mach-orion5x/addr-map.c -@@ -76,7 +76,7 @@ static int __init cpu_win_can_remap(cons - /* - * Description of the windows needed by the platform code - */ --static struct __initdata orion_addr_map_cfg addr_map_cfg = { -+static struct orion_addr_map_cfg addr_map_cfg __initdata = { - .num_wins = 8, - .cpu_win_can_remap = cpu_win_can_remap, - .bridge_virt_base = ORION5X_BRIDGE_VIRT_BASE, diff --git a/target/linux/orion/patches/a01-dt2-fixes-for-3.3.patch b/target/linux/orion/patches/a01-dt2-fixes-for-3.3.patch deleted file mode 100644 index c101f14..0000000 --- a/target/linux/orion/patches/a01-dt2-fixes-for-3.3.patch +++ /dev/null @@ -1,34 +0,0 @@ ---- a/arch/arm/mach-orion5x/dt2-setup.c -+++ b/arch/arm/mach-orion5x/dt2-setup.c -@@ -146,7 +146,7 @@ void __init dt2_pci_preinit(void) - } - } - --static int __init dt2_pci_map_irq(struct pci_dev *dev, u8 slot, u8 pin) -+static int __init dt2_pci_map_irq(const struct pci_dev *dev, u8 slot, u8 pin) - { - int irq; - -@@ -383,8 +383,7 @@ __tagtable(ATAG_MV_UBOOT, parse_tag_dt2_ - * - * Vanilla kernel should use "tag_fixup_mem32" function. - */ --void __init openwrt_fixup(struct machine_desc *mdesc, struct tag *t, -- char **from, struct meminfo *meminfo) -+void __init openwrt_fixup(struct tag *t, char **from, struct meminfo *meminfo) - { - char *p = NULL; - static char openwrt_init_tag[] __initdata = " init=/etc/preinit"; -@@ -437,10 +436,11 @@ void __init openwrt_fixup(struct machine - /* Warning: Freecom uses their own custom bootloader with mach-type (=1500) */ - MACHINE_START(DT2, "Freecom DataTank Gateway") - /* Maintainer: Zintis Petersons <Zintis.Petersons@abcsolutions.lv> */ -- .boot_params = 0x00000100, -+ .atag_offset = 0x100, - .init_machine = dt2_init, - .map_io = orion5x_map_io, - .init_irq = orion5x_init_irq, - .timer = &orion5x_timer, - .fixup = openwrt_fixup, //tag_fixup_mem32, -+ .restart = orion5x_restart, - MACHINE_END |