Skip to contentSkip to conversation

board/lego/ev3: update to 4.14 kernel

PATCH New David Lechner 2 participants 2 messages Nov 20, 2017 – Nov 22, 2017

lore
Share & tools
lore

David Lechner

author
#0 lore raw

PATCH 1/1 board/lego/ev3: update to 4.14 kernel

This updates the LEGO MINDSTORMS EV3 board to Linux kernel 4.14.

* Kernel patches are dropped because they are in mainline now.
* This caused the kernel image to be >3M so some adjustments to the image sizes/layout needed to be made in U-Boot.
* Updated U-Boot version bumped since we are touching this config anyway

Signed-off-by David Lechner <[email protected]>

---

I've boot-tested these changes on an EV3. And I plan on submitting a similar patch upstream to U-Boot.

 board/lego/ev3/genimage.cfg                        |  6 +-
 board/lego/ev3/linux.fragment                      |  6 ++
 .../patches/linux/0001-adc-device-tree-node.patch  | 56 --------------
 .../linux/0002-sound-device-tree-node.patch        | 85 ----------------------
 ...onfigs-legoev3-increase-flash-image-sizes.patch | 31 ++++++++
 configs/lego_ev3_defconfig                         |  8 +-
 6 files changed, 44 insertions(+), 148 deletions(-)
 delete mode 100644 board/lego/ev3/patches/linux/0001-adc-device-tree-node.patch
 delete mode 100644 board/lego/ev3/patches/linux/0002-sound-device-tree-node.patch
 create mode 100644 board/lego/ev3/patches/uboot/configs-legoev3-increase-flash-image-sizes.patch
board/lego/ev3/genimage.cfg +3 -3
index 0ec580c..3da3048 100644
@@ -20,13 +20,13 @@ image flash.bin {
 	}
 	partition uimage {
 		image = "uImage.da850-lego-ev3"
-		size = 3M
+		size = 4M
 		offset = 0x50000
 	}
 	partition rootfs {
 		image = "rootfs.squashfs"
-		size = 9600K
-		offset = 0x350000
+		size = 10M
+		offset = 0x450000
 	}
 }
board/lego/ev3/linux.fragment +6 -0
index 439cccf..30dea57 100644
@@ -54,3 +54,9 @@ CONFIG_SQUASHFS=y
 CONFIG_SQUASHFS_LZ4=y
 CONFIG_SQUASHFS_LZO=y
 CONFIG_SQUASHFS_XZ=y
+CONFIG_DRM=y
+CONFIG_DRM_TILCDC=n
+CONFIG_DRM_DUMB_VGA_DAC=n
+CONFIG_DRM_TINYDRM=y
+CONFIG_TINYDRM_ST7586=y
+CONFIG_FB_DA8XX=n
board/lego/ev3/patches/linux/0001-adc-device-tree-node.patch deleted +0 -56

56 lines not on this page · raw message

board/lego/ev3/patches/linux/0002-sound-device-tree-node.patch deleted +0 -85

85 lines not on this page · raw message

board/lego/ev3/patches/uboot/configs-legoev3-increase-flash-image-sizes.patch new file +31 -0
new file mode 100644
index 0000000..ee0ce61
@@ -0,0 +1,31 @@
+From cdd8d11858fa34f6e813fae46b5556e9fb3570dc Mon Sep 17 00:00:00 2001
+From: David Lechner <[email protected]>
+Date: Sun, 19 Nov 2017 19:54:32 -0600
+Subject: [PATCH] configs: legoev3: increase flash image sizes
+
+This increases the kernel image to 4M and the rootfs image to 10M.
+
+It is getting hard to get a kernel image to fit in 3M and the rootfs image
+size now matches the filesyssize variable.
+
+Signed-off-by: David Lechner <[email protected]>
+---
+ include/configs/legoev3.h | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/include/configs/legoev3.h b/include/configs/legoev3.h
+index 79fa3c4..2eeaf85 100644
+--- a/include/configs/legoev3.h
++++ b/include/configs/legoev3.h
+@@ -204,7 +204,7 @@
+ 	"mmcargs=setenv bootargs mem=${memsize} console=${console} root=/dev/mmcblk0p2 rw rootwait lpj=747520\0" \
+ 	"mmcboot=bootm ${loadaddr}\0" \
+ 	"flashargs=setenv bootargs mem=${memsize} initrd=${filesysaddr},${filesyssize} root=/dev/ram0 rw rootfstype=squashfs console=${console} lpj=747520\0" \
+-	"flashboot=sf probe 0; sf read ${loadaddr} 0x50000 0x300000; sf read ${filesysaddr} 0x350000 0x960000; bootm ${loadaddr}\0" \
++	"flashboot=sf probe 0; sf read ${loadaddr} 0x50000 0x400000; sf read ${filesysaddr} 0x450000 0xA00000; bootm ${loadaddr}\0" \
+ 	"loadimage=fatload mmc 0 ${loadaddr} uImage\0" \
+ 	"loadbootscr=fatload mmc 0 ${bootscraddr} boot.scr\0" \
+ 	"bootscript=source ${bootscraddr}\0" \
+-- 
+2.7.4
+
configs/lego_ev3_defconfig +4 -4
index dea84d9..0281924 100644
@@ -9,13 +9,13 @@ BR2_GLOBAL_PATCH_DIR="board/lego/ev3/patches"
 BR2_TARGET_GENERIC_GETTY=y
 BR2_TARGET_GENERIC_GETTY_PORT="ttyS1"
 BR2_ROOTFS_POST_IMAGE_SCRIPT="board/lego/ev3/post-image.sh"
-# Linux headers same as kernel, a 4.11 series
-BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_11=y
+# Linux headers same as kernel, a 4.14 series
+BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_14=y
 
 # Kernel
 BR2_LINUX_KERNEL=y
 BR2_LINUX_KERNEL_CUSTOM_VERSION=y
-BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.11"
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.14"
 BR2_LINUX_KERNEL_DEFCONFIG="davinci_all"
 BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="board/lego/ev3/linux.fragment"
 BR2_LINUX_KERNEL_UIMAGE_LOADADDR="0xc0008000"

@@ -36,7 +36,7 @@ BR2_TARGET_ROOTFS_SQUASHFS4_XZ=y
 BR2_TARGET_UBOOT=y
 BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y
 BR2_TARGET_UBOOT_CUSTOM_VERSION=y
-BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2017.05"
+BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2017.11"
 BR2_TARGET_UBOOT_BOARD_DEFCONFIG="legoev3"
 
 # host
Signature · 1 line
2.7.4
Applied
#1 lore raw

PATCH 1/1 board/lego/ev3: update to 4.14 kernel

Hello,

Quoted 9 lines · David Lechner

This updates the LEGO MINDSTORMS EV3 board to Linux kernel 4.14.

* Kernel patches are dropped because they are in mainline now.
* This caused the kernel image to be >3M so some adjustments to the image sizes/layout needed to be made in U-Boot.
* Updated U-Boot version bumped since we are touching this config anyway

Signed-off-by David Lechner <[email protected]>

---

Applied to next, thanks.

Thomas

Signature · 3 lines
Thomas Petazzoni, CTO, Free Electrons
Embedded Linux, Kernel and Android engineering
http://free-electrons.com