From cc2cf8f3d540c26aa672bfcfe0ebdb11ba8cdb6f Mon Sep 17 00:00:00 2001 From: Imre Kaloz Date: Mon, 7 Nov 2011 21:13:13 +0000 Subject: [PATCH] update 3.1 patches SVN-Revision: 28814 --- .../001-cns3xxx_remove_missing_includes.patch | 45 ------------------- .../patches-3.1/049-cns3xxx_smp_support.patch | 2 +- .../patches-3.1/100-laguna_support.patch | 16 +++---- .../patches-3.1/104-cns3xxx_gpio.patch | 2 +- 4 files changed, 10 insertions(+), 55 deletions(-) delete mode 100644 target/linux/cns3xxx/patches-3.1/001-cns3xxx_remove_missing_includes.patch diff --git a/target/linux/cns3xxx/patches-3.1/001-cns3xxx_remove_missing_includes.patch b/target/linux/cns3xxx/patches-3.1/001-cns3xxx_remove_missing_includes.patch deleted file mode 100644 index ddc060aa62..0000000000 --- a/target/linux/cns3xxx/patches-3.1/001-cns3xxx_remove_missing_includes.patch +++ /dev/null @@ -1,45 +0,0 @@ -From b1bd6bd7c230e00b40b0b859f3c23eb56ef39f0c Mon Sep 17 00:00:00 2001 -From: Imre Kaloz -Date: Fri, 2 Sep 2011 08:07:00 +0200 -Subject: [PATCH] ARM: remove missing cns3xxx includes - -Commit c9d95fbe59e426eed7f16e7cac812e46ac4772d0 deleted cns3xxx' hardware.h, -but didn't remove references for it, breaking the build. - -Signed-off-by: Imre Kaloz ---- - arch/arm/mach-cns3xxx/include/mach/entry-macro.S | 1 - - arch/arm/mach-cns3xxx/include/mach/system.h | 1 - - arch/arm/mach-cns3xxx/include/mach/uncompress.h | 1 - - 3 files changed, 0 insertions(+), 3 deletions(-) - ---- a/arch/arm/mach-cns3xxx/include/mach/entry-macro.S -+++ b/arch/arm/mach-cns3xxx/include/mach/entry-macro.S -@@ -8,7 +8,6 @@ - * published by the Free Software Foundation. - */ - --#include - #include - - .macro disable_fiq ---- a/arch/arm/mach-cns3xxx/include/mach/system.h -+++ b/arch/arm/mach-cns3xxx/include/mach/system.h -@@ -13,7 +13,6 @@ - - #include - #include --#include - - static inline void arch_idle(void) - { ---- a/arch/arm/mach-cns3xxx/include/mach/uncompress.h -+++ b/arch/arm/mach-cns3xxx/include/mach/uncompress.h -@@ -8,7 +8,6 @@ - */ - - #include --#include - #include - - #define AMBA_UART_DR(base) (*(volatile unsigned char *)((base) + 0x00)) diff --git a/target/linux/cns3xxx/patches-3.1/049-cns3xxx_smp_support.patch b/target/linux/cns3xxx/patches-3.1/049-cns3xxx_smp_support.patch index 492312931e..854c7fa7a6 100644 --- a/target/linux/cns3xxx/patches-3.1/049-cns3xxx_smp_support.patch +++ b/target/linux/cns3xxx/patches-3.1/049-cns3xxx_smp_support.patch @@ -404,7 +404,7 @@ +} --- a/arch/arm/Kconfig +++ b/arch/arm/Kconfig -@@ -1350,7 +1350,7 @@ config SMP +@@ -1376,7 +1376,7 @@ config SMP depends on REALVIEW_EB_ARM11MP || REALVIEW_EB_A9MP || \ MACH_REALVIEW_PB11MP || MACH_REALVIEW_PBX || ARCH_OMAP4 || \ ARCH_EXYNOS4 || ARCH_TEGRA || ARCH_U8500 || ARCH_VEXPRESS_CA9X4 || \ diff --git a/target/linux/cns3xxx/patches-3.1/100-laguna_support.patch b/target/linux/cns3xxx/patches-3.1/100-laguna_support.patch index 7e6628bad5..12fe8005e9 100644 --- a/target/linux/cns3xxx/patches-3.1/100-laguna_support.patch +++ b/target/linux/cns3xxx/patches-3.1/100-laguna_support.patch @@ -980,13 +980,13 @@ pm_power_off = cns3xxx_power_off; } ---- a/arch/arm/mach-cns3xxx/include/mach/platform.h -+++ b/arch/arm/mach-cns3xxx/include/mach/platform.h -@@ -22,5 +22,7 @@ struct cns3xxx_plat_info { - u32 phy[3]; - }; +--- a/arch/arm/mach-cns3xxx/core.h ++++ b/arch/arm/mach-cns3xxx/core.h +@@ -12,6 +12,7 @@ + #define __CNS3XXX_CORE_H + extern struct sys_timer cns3xxx_timer; +extern int cns3xxx_pcie_init(u8 bitmap); -+ - #endif /* __ASM_ARCH_PLATFORM_H */ - #endif + + #ifdef CONFIG_CACHE_L2X0 + void __init cns3xxx_l2x0_init(void); diff --git a/target/linux/cns3xxx/patches-3.1/104-cns3xxx_gpio.patch b/target/linux/cns3xxx/patches-3.1/104-cns3xxx_gpio.patch index 8b656965f1..6dff5b07d7 100644 --- a/target/linux/cns3xxx/patches-3.1/104-cns3xxx_gpio.patch +++ b/target/linux/cns3xxx/patches-3.1/104-cns3xxx_gpio.patch @@ -119,7 +119,7 @@ /* used by entry-macro.S */ --- a/arch/arm/mach-cns3xxx/core.h +++ b/arch/arm/mach-cns3xxx/core.h -@@ -19,7 +19,7 @@ void __init cns3xxx_l2x0_init(void); +@@ -20,7 +20,7 @@ void __init cns3xxx_l2x0_init(void); static inline void cns3xxx_l2x0_init(void) {} #endif /* CONFIG_CACHE_L2X0 */ -- 2.30.2