From e44d1e17da089fdc7e7cb1cfa48334993e8aa427 Mon Sep 17 00:00:00 2001 From: Linus Walleij Date: Sat, 26 Jan 2019 13:36:49 +0100 Subject: gemini: Add v4.19 kernel patches This is the remainder of kernel patches for the v4.19 kernel. A whole slew of the previous patch stack is now upstream, so this mainly contains the stuff that was added upstream between v4.19 and v5.0-rc1, and then the USB FOTG201 patches from Hans. Signed-off-by: Linus Walleij --- .../0011-ARM-dts-Fix-up-SQ201-flash-access.patch | 73 ++++++++++++++++++++++ 1 file changed, 73 insertions(+) create mode 100644 target/linux/gemini/patches-4.19/0011-ARM-dts-Fix-up-SQ201-flash-access.patch (limited to 'target/linux/gemini/patches-4.19/0011-ARM-dts-Fix-up-SQ201-flash-access.patch') diff --git a/target/linux/gemini/patches-4.19/0011-ARM-dts-Fix-up-SQ201-flash-access.patch b/target/linux/gemini/patches-4.19/0011-ARM-dts-Fix-up-SQ201-flash-access.patch new file mode 100644 index 0000000000..2b72dcd63d --- /dev/null +++ b/target/linux/gemini/patches-4.19/0011-ARM-dts-Fix-up-SQ201-flash-access.patch @@ -0,0 +1,73 @@ +From 186692e51e6c40d8ebd05d25f009098eb00f8110 Mon Sep 17 00:00:00 2001 +From: Linus Walleij +Date: Fri, 19 Oct 2018 09:00:51 +0200 +Subject: [PATCH 11/18] ARM: dts: Fix up SQ201 flash access + +This sets the partition information on the SQ201 to be read +out from the RedBoot partition table, removes the static +partition table and sets our boot options to mount root from +/dev/mtdblock2 where the initramfs resides. + +Signed-off-by: Linus Walleij +--- + arch/arm/boot/dts/gemini-sq201.dts | 37 ++++-------------------------- + 1 file changed, 5 insertions(+), 32 deletions(-) + +diff --git a/arch/arm/boot/dts/gemini-sq201.dts b/arch/arm/boot/dts/gemini-sq201.dts +index 79df6ce5bc6a..c5bb24102b75 100644 +--- a/arch/arm/boot/dts/gemini-sq201.dts ++++ b/arch/arm/boot/dts/gemini-sq201.dts +@@ -20,7 +20,7 @@ + }; + + chosen { +- bootargs = "console=ttyS0,115200n8 root=/dev/sda1 rw rootwait"; ++ bootargs = "console=ttyS0,115200n8 root=/dev/mtdblock2 rw rootfstype=squashfs,jffs2 rootwait"; + stdout-path = &uart0; + }; + +@@ -131,37 +131,10 @@ + /* 16MB of flash */ + reg = <0x30000000 0x01000000>; + +- partition@0 { +- label = "RedBoot"; +- reg = <0x00000000 0x00120000>; +- read-only; +- }; +- partition@120000 { +- label = "Kernel"; +- reg = <0x00120000 0x00200000>; +- }; +- partition@320000 { +- label = "Ramdisk"; +- reg = <0x00320000 0x00600000>; +- }; +- partition@920000 { +- label = "Application"; +- reg = <0x00920000 0x00600000>; +- }; +- partition@f20000 { +- label = "VCTL"; +- reg = <0x00f20000 0x00020000>; +- read-only; +- }; +- partition@f40000 { +- label = "CurConf"; +- reg = <0x00f40000 0x000a0000>; +- read-only; +- }; +- partition@fe0000 { +- label = "FIS directory"; +- reg = <0x00fe0000 0x00020000>; +- read-only; ++ partitions { ++ compatible = "redboot-fis"; ++ /* Eraseblock at 0xfe0000 */ ++ fis-index-block = <0x1fc>; + }; + }; + +-- +2.19.2 + -- cgit v1.2.3