[LEDE-DEV,1/1] at91: update kernel 4.9.73 to 4.14.11

Message ID 9c73c9ff2141e07c5aa6690563e25d466f014449.1515448484.git.sandeepsheriker.mallikarjun@microchip.com
State Changes Requested
Delegated to: John Crispin
Headers show
Series
  • [LEDE-DEV,1/1] at91: update kernel 4.9.73 to 4.14.11
Related show

Commit Message

Sandeep Sheriker Mallikarjun Jan. 8, 2018, 10:21 p.m.
update at91 kernel 4.9.73 to 4.14.11

Signed-off-by: Sandeep Sheriker Mallikarjun <sandeepsheriker.mallikarjun@microchip.com>
---
 target/linux/at91/Makefile                                         | 2 +-
 target/linux/at91/{config-4.9 => config-4.14}                      | 6 ++++++
 .../100-ARM-at91-build-dtb-for-LMU5000.patch                       | 0
 .../101-ARM-at91-build-dtb-for-q5xr5.patch                         | 0
 .../102-ARM-at91-build-dtb-for-wb45n.patch                         | 0
 .../103-ARM-at91-build-dtb-for-wb50n.patch                         | 0
 target/linux/at91/sama5/config-default                             | 7 +++++++
 7 files changed, 14 insertions(+), 1 deletion(-)
 rename target/linux/at91/{config-4.9 => config-4.14} (97%)
 rename target/linux/at91/{patches-4.9 => patches-4.14}/100-ARM-at91-build-dtb-for-LMU5000.patch (100%)
 rename target/linux/at91/{patches-4.9 => patches-4.14}/101-ARM-at91-build-dtb-for-q5xr5.patch (100%)
 rename target/linux/at91/{patches-4.9 => patches-4.14}/102-ARM-at91-build-dtb-for-wb45n.patch (100%)
 rename target/linux/at91/{patches-4.9 => patches-4.14}/103-ARM-at91-build-dtb-for-wb50n.patch (100%)

Comments

John Crispin Jan. 13, 2018, 7:32 a.m. | #1
On 08/01/18 23:21, Sandeep Sheriker Mallikarjun wrote:
> update at91 kernel 4.9.73 to 4.14.11
>
> Signed-off-by: Sandeep Sheriker Mallikarjun <sandeepsheriker.mallikarjun@microchip.com>
> ---
>   target/linux/at91/Makefile                                         | 2 +-
>   target/linux/at91/{config-4.9 => config-4.14}                      | 6 ++++++
>   .../100-ARM-at91-build-dtb-for-LMU5000.patch                       | 0
>   .../101-ARM-at91-build-dtb-for-q5xr5.patch                         | 0
>   .../102-ARM-at91-build-dtb-for-wb45n.patch                         | 0
>   .../103-ARM-at91-build-dtb-for-wb50n.patch                         | 0
>   target/linux/at91/sama5/config-default                             | 7 +++++++

Hi,

the patch to target/linux/at91/sama5/config-default does not apply. 
please fix and resend the patch

     John

>   7 files changed, 14 insertions(+), 1 deletion(-)
>   rename target/linux/at91/{config-4.9 => config-4.14} (97%)
>   rename target/linux/at91/{patches-4.9 => patches-4.14}/100-ARM-at91-build-dtb-for-LMU5000.patch (100%)
>   rename target/linux/at91/{patches-4.9 => patches-4.14}/101-ARM-at91-build-dtb-for-q5xr5.patch (100%)
>   rename target/linux/at91/{patches-4.9 => patches-4.14}/102-ARM-at91-build-dtb-for-wb45n.patch (100%)
>   rename target/linux/at91/{patches-4.9 => patches-4.14}/103-ARM-at91-build-dtb-for-wb50n.patch (100%)
>
> diff --git a/target/linux/at91/Makefile b/target/linux/at91/Makefile
> index cae3c62..4dc70eb 100644
> --- a/target/linux/at91/Makefile
> +++ b/target/linux/at91/Makefile
> @@ -13,7 +13,7 @@ BOARDNAME:=Microchip (Atmel AT91)
>   FEATURES:=ext4 squashfs targz usb usbgadget ubifs
>   SUBTARGETS:=sama5 legacy
>   
> -KERNEL_PATCHVER:=4.9
> +KERNEL_PATCHVER:=4.14
>   
>   include $(INCLUDE_DIR)/target.mk
>   
> diff --git a/target/linux/at91/config-4.9 b/target/linux/at91/config-4.14
> similarity index 97%
> rename from target/linux/at91/config-4.9
> rename to target/linux/at91/config-4.14
> index c0151a5..4fdaccd 100644
> --- a/target/linux/at91/config-4.9
> +++ b/target/linux/at91/config-4.14
> @@ -271,3 +271,9 @@ CONFIG_ZBOOT_ROM_BSS=0
>   CONFIG_ZBOOT_ROM_TEXT=0
>   CONFIG_ZLIB_DEFLATE=y
>   CONFIG_ZLIB_INFLATE=y
> +CONFIG_DEBUG_USER=y
> +CONFIG_DEBUG_ALIGN_RODATA=y
> +CONFIG_AT91_SOC_ID=y
> +# CONFIG_TEE is not set
> +CONFIG_PRINTK_SAFE_LOG_BUF_SHIFT=13
> +CONFIG_MACB_USE_HWSTAMP=y
> diff --git a/target/linux/at91/patches-4.9/100-ARM-at91-build-dtb-for-LMU5000.patch b/target/linux/at91/patches-4.14/100-ARM-at91-build-dtb-for-LMU5000.patch
> similarity index 100%
> rename from target/linux/at91/patches-4.9/100-ARM-at91-build-dtb-for-LMU5000.patch
> rename to target/linux/at91/patches-4.14/100-ARM-at91-build-dtb-for-LMU5000.patch
> diff --git a/target/linux/at91/patches-4.9/101-ARM-at91-build-dtb-for-q5xr5.patch b/target/linux/at91/patches-4.14/101-ARM-at91-build-dtb-for-q5xr5.patch
> similarity index 100%
> rename from target/linux/at91/patches-4.9/101-ARM-at91-build-dtb-for-q5xr5.patch
> rename to target/linux/at91/patches-4.14/101-ARM-at91-build-dtb-for-q5xr5.patch
> diff --git a/target/linux/at91/patches-4.9/102-ARM-at91-build-dtb-for-wb45n.patch b/target/linux/at91/patches-4.14/102-ARM-at91-build-dtb-for-wb45n.patch
> similarity index 100%
> rename from target/linux/at91/patches-4.9/102-ARM-at91-build-dtb-for-wb45n.patch
> rename to target/linux/at91/patches-4.14/102-ARM-at91-build-dtb-for-wb45n.patch
> diff --git a/target/linux/at91/patches-4.9/103-ARM-at91-build-dtb-for-wb50n.patch b/target/linux/at91/patches-4.14/103-ARM-at91-build-dtb-for-wb50n.patch
> similarity index 100%
> rename from target/linux/at91/patches-4.9/103-ARM-at91-build-dtb-for-wb50n.patch
> rename to target/linux/at91/patches-4.14/103-ARM-at91-build-dtb-for-wb50n.patch
> diff --git a/target/linux/at91/sama5/config-default b/target/linux/at91/sama5/config-default
> index 736f76b..b720363 100644
> --- a/target/linux/at91/sama5/config-default
> +++ b/target/linux/at91/sama5/config-default
> @@ -8,7 +8,10 @@ CONFIG_ARM_L1_CACHE_SHIFT_6=y
>   CONFIG_ARM_PATCH_IDIV=y
>   # CONFIG_ARM_THUMBEE is not set
>   CONFIG_ARM_VIRT_EXT=y
> +# CONFIG_CPU_ICACHE_DISABLE is not set
>   CONFIG_ATMEL_AIC5_IRQ=y
> +CONFIG_ARM_THUMB=y
> +# CONFIG_ARM_THUMBEE is not set
>   CONFIG_CACHE_L2X0=y
>   CONFIG_CPU_32v6K=y
>   CONFIG_CPU_32v7=y
> @@ -83,6 +86,10 @@ CONFIG_DRM_GEM_CMA_HELPER=y
>   CONFIG_DRM_KMS_CMA_HELPER=y
>   ONFIG_DST_CACHE=y
>   CONFIG_DCACHE_WORD_ACCESS=y
> +
> +CONFIG_ZBOOT_ROM_TEXT=0x0
> +CONFIG_ZBOOT_ROM_BSS=0x0
> +
>   #
>   # At least one emulation must be selected
>   #

Patch

diff --git a/target/linux/at91/Makefile b/target/linux/at91/Makefile
index cae3c62..4dc70eb 100644
--- a/target/linux/at91/Makefile
+++ b/target/linux/at91/Makefile
@@ -13,7 +13,7 @@  BOARDNAME:=Microchip (Atmel AT91)
 FEATURES:=ext4 squashfs targz usb usbgadget ubifs
 SUBTARGETS:=sama5 legacy
 
-KERNEL_PATCHVER:=4.9
+KERNEL_PATCHVER:=4.14
 
 include $(INCLUDE_DIR)/target.mk
 
diff --git a/target/linux/at91/config-4.9 b/target/linux/at91/config-4.14
similarity index 97%
rename from target/linux/at91/config-4.9
rename to target/linux/at91/config-4.14
index c0151a5..4fdaccd 100644
--- a/target/linux/at91/config-4.9
+++ b/target/linux/at91/config-4.14
@@ -271,3 +271,9 @@  CONFIG_ZBOOT_ROM_BSS=0
 CONFIG_ZBOOT_ROM_TEXT=0
 CONFIG_ZLIB_DEFLATE=y
 CONFIG_ZLIB_INFLATE=y
+CONFIG_DEBUG_USER=y
+CONFIG_DEBUG_ALIGN_RODATA=y
+CONFIG_AT91_SOC_ID=y
+# CONFIG_TEE is not set
+CONFIG_PRINTK_SAFE_LOG_BUF_SHIFT=13
+CONFIG_MACB_USE_HWSTAMP=y
diff --git a/target/linux/at91/patches-4.9/100-ARM-at91-build-dtb-for-LMU5000.patch b/target/linux/at91/patches-4.14/100-ARM-at91-build-dtb-for-LMU5000.patch
similarity index 100%
rename from target/linux/at91/patches-4.9/100-ARM-at91-build-dtb-for-LMU5000.patch
rename to target/linux/at91/patches-4.14/100-ARM-at91-build-dtb-for-LMU5000.patch
diff --git a/target/linux/at91/patches-4.9/101-ARM-at91-build-dtb-for-q5xr5.patch b/target/linux/at91/patches-4.14/101-ARM-at91-build-dtb-for-q5xr5.patch
similarity index 100%
rename from target/linux/at91/patches-4.9/101-ARM-at91-build-dtb-for-q5xr5.patch
rename to target/linux/at91/patches-4.14/101-ARM-at91-build-dtb-for-q5xr5.patch
diff --git a/target/linux/at91/patches-4.9/102-ARM-at91-build-dtb-for-wb45n.patch b/target/linux/at91/patches-4.14/102-ARM-at91-build-dtb-for-wb45n.patch
similarity index 100%
rename from target/linux/at91/patches-4.9/102-ARM-at91-build-dtb-for-wb45n.patch
rename to target/linux/at91/patches-4.14/102-ARM-at91-build-dtb-for-wb45n.patch
diff --git a/target/linux/at91/patches-4.9/103-ARM-at91-build-dtb-for-wb50n.patch b/target/linux/at91/patches-4.14/103-ARM-at91-build-dtb-for-wb50n.patch
similarity index 100%
rename from target/linux/at91/patches-4.9/103-ARM-at91-build-dtb-for-wb50n.patch
rename to target/linux/at91/patches-4.14/103-ARM-at91-build-dtb-for-wb50n.patch
diff --git a/target/linux/at91/sama5/config-default b/target/linux/at91/sama5/config-default
index 736f76b..b720363 100644
--- a/target/linux/at91/sama5/config-default
+++ b/target/linux/at91/sama5/config-default
@@ -8,7 +8,10 @@  CONFIG_ARM_L1_CACHE_SHIFT_6=y
 CONFIG_ARM_PATCH_IDIV=y
 # CONFIG_ARM_THUMBEE is not set
 CONFIG_ARM_VIRT_EXT=y
+# CONFIG_CPU_ICACHE_DISABLE is not set
 CONFIG_ATMEL_AIC5_IRQ=y
+CONFIG_ARM_THUMB=y
+# CONFIG_ARM_THUMBEE is not set
 CONFIG_CACHE_L2X0=y
 CONFIG_CPU_32v6K=y
 CONFIG_CPU_32v7=y
@@ -83,6 +86,10 @@  CONFIG_DRM_GEM_CMA_HELPER=y
 CONFIG_DRM_KMS_CMA_HELPER=y
 ONFIG_DST_CACHE=y
 CONFIG_DCACHE_WORD_ACCESS=y
+
+CONFIG_ZBOOT_ROM_TEXT=0x0
+CONFIG_ZBOOT_ROM_BSS=0x0
+
 #
 # At least one emulation must be selected
 #