From ab563374aebc3733ef52bf29158f161046c45101 Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Tue, 28 Jan 2020 13:45:37 +0100 Subject: linux: update to latest 4.19.x --- mk/linux-ver.mk | 4 +- target/linux/Config.in.kernelversion | 2 +- target/linux/patches/4.19.79/arc.patch | 12 --- target/linux/patches/4.19.79/fec-coldfire.patch | 118 ----------------------- target/linux/patches/4.19.79/or1k-more-ram.patch | 12 --- target/linux/patches/4.19.79/startup.patch | 34 ------- target/linux/patches/4.19.99/arc.patch | 12 +++ target/linux/patches/4.19.99/fec-coldfire.patch | 118 +++++++++++++++++++++++ target/linux/patches/4.19.99/or1k-more-ram.patch | 12 +++ target/linux/patches/4.19.99/startup.patch | 34 +++++++ 10 files changed, 179 insertions(+), 179 deletions(-) delete mode 100644 target/linux/patches/4.19.79/arc.patch delete mode 100644 target/linux/patches/4.19.79/fec-coldfire.patch delete mode 100644 target/linux/patches/4.19.79/or1k-more-ram.patch delete mode 100644 target/linux/patches/4.19.79/startup.patch create mode 100644 target/linux/patches/4.19.99/arc.patch create mode 100644 target/linux/patches/4.19.99/fec-coldfire.patch create mode 100644 target/linux/patches/4.19.99/or1k-more-ram.patch create mode 100644 target/linux/patches/4.19.99/startup.patch diff --git a/mk/linux-ver.mk b/mk/linux-ver.mk index 33f2341b7..6a2cf9980 100644 --- a/mk/linux-ver.mk +++ b/mk/linux-ver.mk @@ -22,10 +22,10 @@ KERNEL_VERSION:= $(KERNEL_FILE_VER)-$(KERNEL_RELEASE) KERNEL_HASH:= e84021a94784de7bb10e4251fb1a87859a8d1c97bd78fb55ad47ab6ce475ec1f endif ifeq ($(ADK_TARGET_LINUX_KERNEL_VERSION_4_19),y) -KERNEL_FILE_VER:= 4.19.79 +KERNEL_FILE_VER:= 4.19.99 KERNEL_RELEASE:= 1 KERNEL_VERSION:= $(KERNEL_FILE_VER)-$(KERNEL_RELEASE) -KERNEL_HASH:= f1143564364f278ba0893a7813afc02da6ecef6d5de147bd5011aa3cc1634b34 +KERNEL_HASH:= 8dbc21f994af9dc3468da4e934a641b457a57cf125d1a8e8f95fe488edd5b5ab endif ifeq ($(ADK_TARGET_LINUX_KERNEL_VERSION_4_14),y) KERNEL_FILE_VER:= 4.14.149 diff --git a/target/linux/Config.in.kernelversion b/target/linux/Config.in.kernelversion index 43d6b027a..21abecf00 100644 --- a/target/linux/Config.in.kernelversion +++ b/target/linux/Config.in.kernelversion @@ -51,7 +51,7 @@ config ADK_TARGET_LINUX_KERNEL_VERSION_5_3 depends on !ADK_TARGET_CPU_ARM_CORTEX_A53 config ADK_TARGET_LINUX_KERNEL_VERSION_4_19 - bool "4.19.79" + bool "4.19.99" select ADK_TARGET_LINUX_KERNEL_NEW depends on !ADK_TARGET_ARCH_AVR32 depends on !ADK_TARGET_ARCH_BFIN diff --git a/target/linux/patches/4.19.79/arc.patch b/target/linux/patches/4.19.79/arc.patch deleted file mode 100644 index 20810ce64..000000000 --- a/target/linux/patches/4.19.79/arc.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -Nur linux-4.17.1.orig/arch/arc/boot/Makefile linux-4.17.1/arch/arc/boot/Makefile ---- linux-4.17.1.orig/arch/arc/boot/Makefile 2018-06-11 22:43:19.000000000 +0200 -+++ linux-4.17.1/arch/arc/boot/Makefile 2018-06-16 18:28:02.000000000 +0200 -@@ -7,7 +7,7 @@ - - OBJCOPYFLAGS= -O binary -R .note -R .note.gnu.build-id -R .comment -S - --LINUX_START_TEXT = $$(readelf -h vmlinux | \ -+LINUX_START_TEXT = $$(${CROSS_COMPILE}readelf -h vmlinux | \ - grep "Entry point address" | grep -o 0x.*) - - UIMAGE_LOADADDR = $(CONFIG_LINUX_LINK_BASE) diff --git a/target/linux/patches/4.19.79/fec-coldfire.patch b/target/linux/patches/4.19.79/fec-coldfire.patch deleted file mode 100644 index 09d8ad047..000000000 --- a/target/linux/patches/4.19.79/fec-coldfire.patch +++ /dev/null @@ -1,118 +0,0 @@ -diff -Nur linux-4.19.75.orig/drivers/net/ethernet/freescale/fec_main.c linux-4.19.75/drivers/net/ethernet/freescale/fec_main.c ---- linux-4.19.75.orig/drivers/net/ethernet/freescale/fec_main.c 2019-09-21 07:17:15.000000000 +0200 -+++ linux-4.19.75/drivers/net/ethernet/freescale/fec_main.c 2019-10-10 01:17:45.284188283 +0200 -@@ -156,7 +156,7 @@ - module_param_array(macaddr, byte, NULL, 0); - MODULE_PARM_DESC(macaddr, "FEC Ethernet MAC address"); - --#if defined(CONFIG_M5272) -+#if defined(CONFIG_COLDFIRE) - /* - * Some hardware gets it MAC address out of local flash memory. - * if this is non-zero then assume it is the address to get MAC from. -@@ -174,7 +174,7 @@ - #else - #define FEC_FLASHMAC 0 - #endif --#endif /* CONFIG_M5272 */ -+#endif /* CONFIG_COLDFIRE */ - - /* The FEC stores dest/src/type/vlan, data, and checksum for receive packets. - * -@@ -958,7 +958,7 @@ - /* Set MII speed */ - writel(fep->phy_speed, fep->hwp + FEC_MII_SPEED); - --#if !defined(CONFIG_M5272) -+#if !defined(CONFIG_COLDFIRE) - if (fep->quirks & FEC_QUIRK_HAS_RACC) { - val = readl(fep->hwp + FEC_RACC); - /* align IP header */ -@@ -1027,7 +1027,7 @@ - #endif - } - --#if !defined(CONFIG_M5272) -+#if !defined(CONFIG_COLDFIRE) - /* enable pause frame*/ - if ((fep->pause_flag & FEC_PAUSE_FLAG_ENABLE) || - ((fep->pause_flag & FEC_PAUSE_FLAG_AUTONEG) && -@@ -1045,13 +1045,13 @@ - } else { - rcntl &= ~FEC_ENET_FCE; - } --#endif /* !defined(CONFIG_M5272) */ -+#endif /* !defined(CONFIG_COLDFIRE) */ - - writel(rcntl, fep->hwp + FEC_R_CNTRL); - - /* Setup multicast filter. */ - set_multicast_list(ndev); --#ifndef CONFIG_M5272 -+#ifndef CONFIG_COLDFIRE - writel(0, fep->hwp + FEC_HASH_TABLE_HIGH); - writel(0, fep->hwp + FEC_HASH_TABLE_LOW); - #endif -@@ -1066,7 +1066,7 @@ - if (fep->bufdesc_ex) - ecntl |= (1 << 4); - --#ifndef CONFIG_M5272 -+#ifndef CONFIG_COLDFIRE - /* Enable the MIB statistic event counters */ - writel(0 << 31, fep->hwp + FEC_MIB_CTRLSTAT); - #endif -@@ -1664,7 +1664,7 @@ - * 3) from flash or fuse (via platform data) - */ - if (!is_valid_ether_addr(iap)) { --#ifdef CONFIG_M5272 -+#ifdef CONFIG_COLDFIRE - if (FEC_FLASHMAC) - iap = (unsigned char *)FEC_FLASHMAC; - #else -@@ -1943,7 +1943,7 @@ - if (fep->quirks & FEC_QUIRK_HAS_GBIT) { - phy_dev->supported &= PHY_GBIT_FEATURES; - phy_dev->supported &= ~SUPPORTED_1000baseT_Half; --#if !defined(CONFIG_M5272) -+#if !defined(CONFIG_COLDFIRE) - phy_dev->supported |= SUPPORTED_Pause; - #endif - } -@@ -2199,7 +2199,7 @@ - } - } - --#if !defined(CONFIG_M5272) -+#if !defined(CONFIG_COLDFIRE) - - static void fec_enet_get_pauseparam(struct net_device *ndev, - struct ethtool_pauseparam *pause) -@@ -2391,7 +2391,7 @@ - static inline void fec_enet_clear_ethtool_stats(struct net_device *dev) - { - } --#endif /* !defined(CONFIG_M5272) */ -+#endif /* !defined(CONFIG_COLDFIRE) */ - - /* ITR clock source is enet system clock (clk_ahb). - * TCTT unit is cycle_ns * 64 cycle -@@ -2596,7 +2596,7 @@ - .get_link = ethtool_op_get_link, - .get_coalesce = fec_enet_get_coalesce, - .set_coalesce = fec_enet_set_coalesce, --#ifndef CONFIG_M5272 -+#ifndef CONFIG_COLDFIRE - .get_pauseparam = fec_enet_get_pauseparam, - .set_pauseparam = fec_enet_set_pauseparam, - .get_strings = fec_enet_get_strings, -@@ -3385,7 +3385,7 @@ - fep->num_rx_queues = num_rx_qs; - fep->num_tx_queues = num_tx_qs; - --#if !defined(CONFIG_M5272) -+#if !defined(CONFIG_COLDFIRE) - /* default enable pause frame auto negotiation */ - if (fep->quirks & FEC_QUIRK_HAS_GBIT) - fep->pause_flag |= FEC_PAUSE_FLAG_AUTONEG; diff --git a/target/linux/patches/4.19.79/or1k-more-ram.patch b/target/linux/patches/4.19.79/or1k-more-ram.patch deleted file mode 100644 index de848c838..000000000 --- a/target/linux/patches/4.19.79/or1k-more-ram.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -Nur linux-4.8.11.orig/arch/openrisc/boot/dts/or1ksim.dts linux-4.8.11/arch/openrisc/boot/dts/or1ksim.dts ---- linux-4.8.11.orig/arch/openrisc/boot/dts/or1ksim.dts 2016-11-26 09:57:13.000000000 +0100 -+++ linux-4.8.11/arch/openrisc/boot/dts/or1ksim.dts 2016-12-04 14:39:46.092952799 +0100 -@@ -11,7 +11,7 @@ - - memory@0 { - device_type = "memory"; -- reg = <0x00000000 0x02000000>; -+ reg = <0x00000000 0x04000000>; - }; - - cpus { diff --git a/target/linux/patches/4.19.79/startup.patch b/target/linux/patches/4.19.79/startup.patch deleted file mode 100644 index dd27de856..000000000 --- a/target/linux/patches/4.19.79/startup.patch +++ /dev/null @@ -1,34 +0,0 @@ -diff -Nur linux-4.17.orig/init/initramfs.c linux-4.17/init/initramfs.c ---- linux-4.17.orig/init/initramfs.c 2018-06-03 23:15:21.000000000 +0200 -+++ linux-4.17/init/initramfs.c 2018-06-10 17:01:16.000000000 +0200 -@@ -659,6 +659,9 @@ - * us a chance to load before device_initcalls. - */ - load_default_modules(); -+#ifdef CONFIG_DEVTMPFS_MOUNT -+ devtmpfs_mount("dev"); -+#endif - - return 0; - } -diff -Nur linux-4.17.orig/init/main.c linux-4.17/init/main.c ---- linux-4.17.orig/init/main.c 2018-06-03 23:15:21.000000000 +0200 -+++ linux-4.17/init/main.c 2018-06-10 17:01:52.000000000 +0200 -@@ -1138,6 +1138,8 @@ - if (ksys_open((const char __user *) "/dev/console", O_RDWR, 0) < 0) - pr_err("Warning: unable to open an initial console.\n"); - -+ printk(KERN_WARNING "Starting Linux (built with OpenADK).\n"); -+ - (void) ksys_dup(0); - (void) ksys_dup(0); - /* -@@ -1146,7 +1148,7 @@ - */ - - if (!ramdisk_execute_command) -- ramdisk_execute_command = "/init"; -+ ramdisk_execute_command = "/sbin/init"; - - if (ksys_access((const char __user *) - ramdisk_execute_command, 0) != 0) { diff --git a/target/linux/patches/4.19.99/arc.patch b/target/linux/patches/4.19.99/arc.patch new file mode 100644 index 000000000..20810ce64 --- /dev/null +++ b/target/linux/patches/4.19.99/arc.patch @@ -0,0 +1,12 @@ +diff -Nur linux-4.17.1.orig/arch/arc/boot/Makefile linux-4.17.1/arch/arc/boot/Makefile +--- linux-4.17.1.orig/arch/arc/boot/Makefile 2018-06-11 22:43:19.000000000 +0200 ++++ linux-4.17.1/arch/arc/boot/Makefile 2018-06-16 18:28:02.000000000 +0200 +@@ -7,7 +7,7 @@ + + OBJCOPYFLAGS= -O binary -R .note -R .note.gnu.build-id -R .comment -S + +-LINUX_START_TEXT = $$(readelf -h vmlinux | \ ++LINUX_START_TEXT = $$(${CROSS_COMPILE}readelf -h vmlinux | \ + grep "Entry point address" | grep -o 0x.*) + + UIMAGE_LOADADDR = $(CONFIG_LINUX_LINK_BASE) diff --git a/target/linux/patches/4.19.99/fec-coldfire.patch b/target/linux/patches/4.19.99/fec-coldfire.patch new file mode 100644 index 000000000..09d8ad047 --- /dev/null +++ b/target/linux/patches/4.19.99/fec-coldfire.patch @@ -0,0 +1,118 @@ +diff -Nur linux-4.19.75.orig/drivers/net/ethernet/freescale/fec_main.c linux-4.19.75/drivers/net/ethernet/freescale/fec_main.c +--- linux-4.19.75.orig/drivers/net/ethernet/freescale/fec_main.c 2019-09-21 07:17:15.000000000 +0200 ++++ linux-4.19.75/drivers/net/ethernet/freescale/fec_main.c 2019-10-10 01:17:45.284188283 +0200 +@@ -156,7 +156,7 @@ + module_param_array(macaddr, byte, NULL, 0); + MODULE_PARM_DESC(macaddr, "FEC Ethernet MAC address"); + +-#if defined(CONFIG_M5272) ++#if defined(CONFIG_COLDFIRE) + /* + * Some hardware gets it MAC address out of local flash memory. + * if this is non-zero then assume it is the address to get MAC from. +@@ -174,7 +174,7 @@ + #else + #define FEC_FLASHMAC 0 + #endif +-#endif /* CONFIG_M5272 */ ++#endif /* CONFIG_COLDFIRE */ + + /* The FEC stores dest/src/type/vlan, data, and checksum for receive packets. + * +@@ -958,7 +958,7 @@ + /* Set MII speed */ + writel(fep->phy_speed, fep->hwp + FEC_MII_SPEED); + +-#if !defined(CONFIG_M5272) ++#if !defined(CONFIG_COLDFIRE) + if (fep->quirks & FEC_QUIRK_HAS_RACC) { + val = readl(fep->hwp + FEC_RACC); + /* align IP header */ +@@ -1027,7 +1027,7 @@ + #endif + } + +-#if !defined(CONFIG_M5272) ++#if !defined(CONFIG_COLDFIRE) + /* enable pause frame*/ + if ((fep->pause_flag & FEC_PAUSE_FLAG_ENABLE) || + ((fep->pause_flag & FEC_PAUSE_FLAG_AUTONEG) && +@@ -1045,13 +1045,13 @@ + } else { + rcntl &= ~FEC_ENET_FCE; + } +-#endif /* !defined(CONFIG_M5272) */ ++#endif /* !defined(CONFIG_COLDFIRE) */ + + writel(rcntl, fep->hwp + FEC_R_CNTRL); + + /* Setup multicast filter. */ + set_multicast_list(ndev); +-#ifndef CONFIG_M5272 ++#ifndef CONFIG_COLDFIRE + writel(0, fep->hwp + FEC_HASH_TABLE_HIGH); + writel(0, fep->hwp + FEC_HASH_TABLE_LOW); + #endif +@@ -1066,7 +1066,7 @@ + if (fep->bufdesc_ex) + ecntl |= (1 << 4); + +-#ifndef CONFIG_M5272 ++#ifndef CONFIG_COLDFIRE + /* Enable the MIB statistic event counters */ + writel(0 << 31, fep->hwp + FEC_MIB_CTRLSTAT); + #endif +@@ -1664,7 +1664,7 @@ + * 3) from flash or fuse (via platform data) + */ + if (!is_valid_ether_addr(iap)) { +-#ifdef CONFIG_M5272 ++#ifdef CONFIG_COLDFIRE + if (FEC_FLASHMAC) + iap = (unsigned char *)FEC_FLASHMAC; + #else +@@ -1943,7 +1943,7 @@ + if (fep->quirks & FEC_QUIRK_HAS_GBIT) { + phy_dev->supported &= PHY_GBIT_FEATURES; + phy_dev->supported &= ~SUPPORTED_1000baseT_Half; +-#if !defined(CONFIG_M5272) ++#if !defined(CONFIG_COLDFIRE) + phy_dev->supported |= SUPPORTED_Pause; + #endif + } +@@ -2199,7 +2199,7 @@ + } + } + +-#if !defined(CONFIG_M5272) ++#if !defined(CONFIG_COLDFIRE) + + static void fec_enet_get_pauseparam(struct net_device *ndev, + struct ethtool_pauseparam *pause) +@@ -2391,7 +2391,7 @@ + static inline void fec_enet_clear_ethtool_stats(struct net_device *dev) + { + } +-#endif /* !defined(CONFIG_M5272) */ ++#endif /* !defined(CONFIG_COLDFIRE) */ + + /* ITR clock source is enet system clock (clk_ahb). + * TCTT unit is cycle_ns * 64 cycle +@@ -2596,7 +2596,7 @@ + .get_link = ethtool_op_get_link, + .get_coalesce = fec_enet_get_coalesce, + .set_coalesce = fec_enet_set_coalesce, +-#ifndef CONFIG_M5272 ++#ifndef CONFIG_COLDFIRE + .get_pauseparam = fec_enet_get_pauseparam, + .set_pauseparam = fec_enet_set_pauseparam, + .get_strings = fec_enet_get_strings, +@@ -3385,7 +3385,7 @@ + fep->num_rx_queues = num_rx_qs; + fep->num_tx_queues = num_tx_qs; + +-#if !defined(CONFIG_M5272) ++#if !defined(CONFIG_COLDFIRE) + /* default enable pause frame auto negotiation */ + if (fep->quirks & FEC_QUIRK_HAS_GBIT) + fep->pause_flag |= FEC_PAUSE_FLAG_AUTONEG; diff --git a/target/linux/patches/4.19.99/or1k-more-ram.patch b/target/linux/patches/4.19.99/or1k-more-ram.patch new file mode 100644 index 000000000..de848c838 --- /dev/null +++ b/target/linux/patches/4.19.99/or1k-more-ram.patch @@ -0,0 +1,12 @@ +diff -Nur linux-4.8.11.orig/arch/openrisc/boot/dts/or1ksim.dts linux-4.8.11/arch/openrisc/boot/dts/or1ksim.dts +--- linux-4.8.11.orig/arch/openrisc/boot/dts/or1ksim.dts 2016-11-26 09:57:13.000000000 +0100 ++++ linux-4.8.11/arch/openrisc/boot/dts/or1ksim.dts 2016-12-04 14:39:46.092952799 +0100 +@@ -11,7 +11,7 @@ + + memory@0 { + device_type = "memory"; +- reg = <0x00000000 0x02000000>; ++ reg = <0x00000000 0x04000000>; + }; + + cpus { diff --git a/target/linux/patches/4.19.99/startup.patch b/target/linux/patches/4.19.99/startup.patch new file mode 100644 index 000000000..dd27de856 --- /dev/null +++ b/target/linux/patches/4.19.99/startup.patch @@ -0,0 +1,34 @@ +diff -Nur linux-4.17.orig/init/initramfs.c linux-4.17/init/initramfs.c +--- linux-4.17.orig/init/initramfs.c 2018-06-03 23:15:21.000000000 +0200 ++++ linux-4.17/init/initramfs.c 2018-06-10 17:01:16.000000000 +0200 +@@ -659,6 +659,9 @@ + * us a chance to load before device_initcalls. + */ + load_default_modules(); ++#ifdef CONFIG_DEVTMPFS_MOUNT ++ devtmpfs_mount("dev"); ++#endif + + return 0; + } +diff -Nur linux-4.17.orig/init/main.c linux-4.17/init/main.c +--- linux-4.17.orig/init/main.c 2018-06-03 23:15:21.000000000 +0200 ++++ linux-4.17/init/main.c 2018-06-10 17:01:52.000000000 +0200 +@@ -1138,6 +1138,8 @@ + if (ksys_open((const char __user *) "/dev/console", O_RDWR, 0) < 0) + pr_err("Warning: unable to open an initial console.\n"); + ++ printk(KERN_WARNING "Starting Linux (built with OpenADK).\n"); ++ + (void) ksys_dup(0); + (void) ksys_dup(0); + /* +@@ -1146,7 +1148,7 @@ + */ + + if (!ramdisk_execute_command) +- ramdisk_execute_command = "/init"; ++ ramdisk_execute_command = "/sbin/init"; + + if (ksys_access((const char __user *) + ramdisk_execute_command, 0) != 0) { -- cgit v1.2.3