From: Alex Suykov Date: Mon, 5 Mar 2018 15:01:05 +0000 (+0200) Subject: chromebook snow: bump kernel to 4.15 X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=842138aaa5a3a0250649aa4406cdd3d31b32d2d6;p=buildroot.git chromebook snow: bump kernel to 4.15 No other changes necessary, 4.15 builds and boots fine. Signed-off-by: Alex Suykov Signed-off-by: Peter Korsgaard --- diff --git a/board/chromebook/snow/linux-4.15-dts-tpm.patch b/board/chromebook/snow/linux-4.15-dts-tpm.patch new file mode 100644 index 0000000000..c71ff1b584 --- /dev/null +++ b/board/chromebook/snow/linux-4.15-dts-tpm.patch @@ -0,0 +1,27 @@ +Some versions of u-boot for this Chromebook check for tpm node +in the device tree and fail badly (reboot) if it is not found. + +While not exactly correct, it is much easier to patch the mainline +device tree to match u-boot expectations than to fix u-boot on +this device. + +See https://code.google.com/p/chromium/issues/detail?id=220169 +and https://lkml.org/lkml/2013/3/4/242 + +Signed-off-by: Alex Suykov + +--- a/arch/arm/boot/dts/exynos5250-snow-common.dtsi ++++ b/arch/arm/boot/dts/exynos5250-snow-common.dtsi +@@ -466,6 +466,11 @@ + status = "okay"; + samsung,i2c-sda-delay = <100>; + samsung,i2c-max-bus-freq = <66000>; ++ ++ tpm { ++ compatible = "infineon,slb9635tt"; ++ reg = <0x20>; ++ }; + }; + + &i2c_5 { + diff --git a/board/chromebook/snow/linux-4.15.fragment b/board/chromebook/snow/linux-4.15.fragment new file mode 100644 index 0000000000..e2786dacba --- /dev/null +++ b/board/chromebook/snow/linux-4.15.fragment @@ -0,0 +1,2 @@ +CONFIG_MWIFIEX=m +CONFIG_MWIFIEX_SDIO=m diff --git a/board/chromebook/snow/linux-4.6-dts-tpm.patch b/board/chromebook/snow/linux-4.6-dts-tpm.patch deleted file mode 100644 index c71ff1b584..0000000000 --- a/board/chromebook/snow/linux-4.6-dts-tpm.patch +++ /dev/null @@ -1,27 +0,0 @@ -Some versions of u-boot for this Chromebook check for tpm node -in the device tree and fail badly (reboot) if it is not found. - -While not exactly correct, it is much easier to patch the mainline -device tree to match u-boot expectations than to fix u-boot on -this device. - -See https://code.google.com/p/chromium/issues/detail?id=220169 -and https://lkml.org/lkml/2013/3/4/242 - -Signed-off-by: Alex Suykov - ---- a/arch/arm/boot/dts/exynos5250-snow-common.dtsi -+++ b/arch/arm/boot/dts/exynos5250-snow-common.dtsi -@@ -466,6 +466,11 @@ - status = "okay"; - samsung,i2c-sda-delay = <100>; - samsung,i2c-max-bus-freq = <66000>; -+ -+ tpm { -+ compatible = "infineon,slb9635tt"; -+ reg = <0x20>; -+ }; - }; - - &i2c_5 { - diff --git a/board/chromebook/snow/linux-4.6.fragment b/board/chromebook/snow/linux-4.6.fragment deleted file mode 100644 index e2786dacba..0000000000 --- a/board/chromebook/snow/linux-4.6.fragment +++ /dev/null @@ -1,2 +0,0 @@ -CONFIG_MWIFIEX=m -CONFIG_MWIFIEX_SDIO=m diff --git a/configs/chromebook_snow_defconfig b/configs/chromebook_snow_defconfig index 70cd42bb75..5558c101d6 100644 --- a/configs/chromebook_snow_defconfig +++ b/configs/chromebook_snow_defconfig @@ -1,16 +1,16 @@ BR2_arm=y BR2_cortex_a15=y -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_6=y +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_15=y BR2_TARGET_GENERIC_GETTY_PORT="tty1" BR2_TARGET_GENERIC_GETTY_TERM="linux" BR2_ROOTFS_POST_BUILD_SCRIPT="board/chromebook/snow/sign.sh" BR2_ROOTFS_POST_IMAGE_SCRIPT="board/chromebook/snow/mksd.sh" BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.6.3" -BR2_LINUX_KERNEL_PATCH="board/chromebook/snow/linux-4.6-dts-tpm.patch" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.15" +BR2_LINUX_KERNEL_PATCH="board/chromebook/snow/linux-4.15-dts-tpm.patch" BR2_LINUX_KERNEL_DEFCONFIG="exynos" -BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="board/chromebook/snow/linux-4.6.fragment" +BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="board/chromebook/snow/linux-4.15.fragment" BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INTREE_DTS_NAME="exynos5250-snow" BR2_PACKAGE_LINUX_FIRMWARE=y