[OpenWrt-Devel] [PATCH] [orion] Update kernel to 3.10.44

Sun Jul 20 04:58:03 EDT 2014

Update the kernel of the orion target to version 3.10.44.
Refresh orion config and patches to match the changes in the kernel

Tested on WRT350N-v2 device.

Signed-off-by: Maarten Bezemer <maarten.bezemer at gmail.com>
---
 Makefile                                        |    2 +-
 config-default                                  |    2 ++
 files/arch/arm/mach-orion5x/dt2-setup.c         |    2 +-
 patches/200-dt2_board_support.patch             |    4 ++--
 patches/210-wn802t_support.patch                |   10 +++++-----
 patches/400-fix-section-mismatch-warnings.patch |   22 +---------------------
 patches/a01-dt2-fixes-for-3.3.patch             |    2 +-
 7 files changed, 13 insertions(+), 31 deletions(-)

Index: target/linux/orion/Makefile
===================================================================

diff --git a/trunk/target/linux/orion/Makefile 
b/trunk/target/linux/orion/Makefile
--- a/trunk/target/linux/orion/Makefile	(revision 41762)
+++ b/trunk/target/linux/orion/Makefile	(working copy)
@@ -12,7 +12,7 @@
 SUBTARGETS:=generic harddisk
 MAINTAINER:=Imre Kaloz <kaloz at openwrt.org>
 
-LINUX_VERSION:=3.3.8
+LINUX_VERSION:=3.10.44
 
 include $(INCLUDE_DIR)/target.mk
 
Index: target/linux/orion/config-default
===================================================================
diff --git a/trunk/target/linux/orion/config-default 
b/trunk/target/linux/orion/config-default
--- a/trunk/target/linux/orion/config-default	(revision 41762)
+++ b/trunk/target/linux/orion/config-default	(working copy)
@@ -3,6 +3,7 @@
 CONFIG_ARCH_HAS_CPU_IDLE_WAIT=y
 CONFIG_ARCH_NR_GPIO=0
 CONFIG_ARCH_ORION5X=y
+# CONFIG_ARCH_ORION5X_DT is not set
 CONFIG_ARCH_REQUIRE_GPIOLIB=y
 # CONFIG_ARCH_SELECT_MEMORY_MODEL is not set
 # CONFIG_ARCH_SPARSEMEM_DEFAULT is not set
@@ -92,6 +93,7 @@
 # CONFIG_LZO_COMPRESS is not set
 # CONFIG_LZO_DECOMPRESS is not set
 # CONFIG_MACH_BIGDISK is not set
+# CONFIG_MACH_EDMINI_V2_DT is not set
 # CONFIG_MACH_D2NET is not set
 # CONFIG_MACH_DB88F5281 is not set
 # CONFIG_MACH_DNS323 is not set
Index: target/linux/orion/files/arch/arm/mach-orion5x/dt2-setup.c
===================================================================
diff --git a/trunk/target/linux/orion/files/arch/arm/mach-orion5x/dt2-setup.c 
b/trunk/target/linux/orion/files/arch/arm/mach-orion5x/dt2-setup.c
--- a/trunk/target/linux/orion/files/arch/arm/mach-orion5x/dt2-setup.c	
(revision 41762)
+++ b/trunk/target/linux/orion/files/arch/arm/mach-orion5x/dt2-setup.c	
(working copy)
@@ -441,6 +441,6 @@
 	.init_machine	= dt2_init,
 	.map_io		= orion5x_map_io,
 	.init_irq	= orion5x_init_irq,
-	.timer		= &orion5x_timer,
+	.init_time	= orion5x_timer_init,
 	.fixup		= openwrt_fixup, //tag_fixup_mem32,
 MACHINE_END
Index: target/linux/orion/patches/200-dt2_board_support.patch
===================================================================
diff --git a/trunk/target/linux/orion/patches/200-dt2_board_support.patch 
b/trunk/target/linux/orion/patches/200-dt2_board_support.patch
--- a/trunk/target/linux/orion/patches/200-dt2_board_support.patch	(revision 
41762)
+++ b/trunk/target/linux/orion/patches/200-dt2_board_support.patch	(working 
copy)
@@ -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
Index: target/linux/orion/patches/210-wn802t_support.patch
===================================================================
diff --git a/trunk/target/linux/orion/patches/210-wn802t_support.patch 
b/trunk/target/linux/orion/patches/210-wn802t_support.patch
--- a/trunk/target/linux/orion/patches/210-wn802t_support.patch	(revision 
41762)
+++ b/trunk/target/linux/orion/patches/210-wn802t_support.patch	(working 
copy)
@@ -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,7 +57,7 @@
  		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 at openwrt.org> */
  	.atag_offset	= 0x100,
  	.init_machine	= wnr854t_init,
@@ -64,7 +64,7 @@
 +	.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
Index: target/linux/orion/patches/400-fix-section-mismatch-warnings.patch
===================================================================
diff --git a/trunk/target/linux/orion/patches/400-fix-section-mismatch-
warnings.patch b/trunk/target/linux/orion/patches/400-fix-section-mismatch-
warnings.patch
--- a/trunk/target/linux/orion/patches/400-fix-section-mismatch-warnings.patch	
(revision 41762)
+++ b/trunk/target/linux/orion/patches/400-fix-section-mismatch-warnings.patch	
(working copy)
@@ -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,
Index: target/linux/orion/patches/a01-dt2-fixes-for-3.3.patch
===================================================================
diff --git a/trunk/target/linux/orion/patches/a01-dt2-fixes-for-3.3.patch 
b/trunk/target/linux/orion/patches/a01-dt2-fixes-for-3.3.patch
--- a/trunk/target/linux/orion/patches/a01-dt2-fixes-for-3.3.patch	(revision 
41762)
+++ b/trunk/target/linux/orion/patches/a01-dt2-fixes-for-3.3.patch	(working 
copy)
@@ -28,7 +28,7 @@
  	.init_machine	= dt2_init,
  	.map_io		= orion5x_map_io,
  	.init_irq	= orion5x_init_irq,
- 	.timer		= &orion5x_timer,
+ 	.init_time	= orion5x_timer_init,
  	.fixup		= openwrt_fixup, //tag_fixup_mem32,
 +	.restart	= orion5x_restart,
  MACHINE_END
_______________________________________________
openwrt-devel mailing list
openwrt-devel at lists.openwrt.org
https://lists.openwrt.org/cgi-bin/mailman/listinfo/openwrt-devel

