From 9dbcc5d00c216e375be17a4bab57cfeef9565250 Mon Sep 17 00:00:00 2001 From: drebrez Date: Sat, 8 Jul 2017 07:30:00 +0200 Subject: [PATCH] [i9070] Use kernel modules / Wifi support (!) * Add kernel module compilation * Add wifi firmware from vendor files (to `/lib/firmware/postmarketos`) and fix modules install path * Add patch to change hardcoded dhd firmware/nvram paths * Add wifi module (dhd) to the list of kernel modules that should be loaded at boot time Details: https://github.com/postmarketOS/pmbootstrap/pull/138 Thanks you very much, drebrez \o/ --- device-samsung-i9070/APKBUILD | 20 +++-- device-samsung-i9070/deviceinfo | 1 - device-samsung-i9070/modules-load.conf | 6 ++ ...ress.patch => 00_fix_return_address.patch} | 0 .../01_remove_ramdisks_from_initramfs.patch | 10 +++ .../02_reduce_lzo_compression.patch | 26 ++++++ .../03_change_modules_install_dir.patch | 16 ++++ .../04_change_dhd_firmware_dir.patch | 15 ++++ linux-samsung-i9070/APKBUILD | 82 +++++++++++++------ .../config-samsung-i9070.armhf | 4 +- 10 files changed, 147 insertions(+), 33 deletions(-) create mode 100644 device-samsung-i9070/modules-load.conf rename linux-samsung-i9070/{fix_return_address.patch => 00_fix_return_address.patch} (100%) create mode 100644 linux-samsung-i9070/01_remove_ramdisks_from_initramfs.patch create mode 100644 linux-samsung-i9070/02_reduce_lzo_compression.patch create mode 100644 linux-samsung-i9070/03_change_modules_install_dir.patch create mode 100644 linux-samsung-i9070/04_change_dhd_firmware_dir.patch diff --git a/device-samsung-i9070/APKBUILD b/device-samsung-i9070/APKBUILD index 7b707cfd6..74a006247 100644 --- a/device-samsung-i9070/APKBUILD +++ b/device-samsung-i9070/APKBUILD @@ -1,6 +1,6 @@ pkgname=device-samsung-i9070 pkgver=1 -pkgrel=4 +pkgrel=5 pkgdesc="Samsung Galaxy S Advance" url="https://github.com/postmarketOS" arch="noarch" @@ -9,7 +9,12 @@ depends="linux-samsung-i9070" makedepends="" install="" subpackages="" -source="deviceinfo initfs-hook.sh 90-android.rules" +source=" + deviceinfo + initfs-hook.sh + 90-android.rules + modules-load.conf +" options="!check" build() { @@ -19,12 +24,15 @@ build() { package() { install -D -m644 "$srcdir/deviceinfo" \ "$pkgdir/etc/deviceinfo" - install -D -m644 "$srcdir"/initfs-hook.sh \ - "$pkgdir"/etc/postmarketos-mkinitfs/hooks/00-${pkgname}.sh + install -D -m644 "$srcdir"/initfs-hook.sh \ + "$pkgdir"/etc/postmarketos-mkinitfs/hooks/00-${pkgname}.sh install -D -m644 "$srcdir"/90-android.rules \ "$pkgdir"/etc/udev/rules.d/90-android.rules + install -D -m644 "$srcdir"/modules-load.conf \ + "$pkgdir"/etc/modules-load.d/00-${pkgname}.conf } -sha512sums="48588e2e2d201e4185454b10bd13eec6888e80c0db3dadb2e082750301c222308be2202c65904df0d27ba246d4ab1012f97e3bf33e67bc7bea526755d5d14d1f deviceinfo +sha512sums="a76e09953981b0610f42b94acc9b3e2d1dc5a8993b0d4bec32b3704359bba04efbc22576001c7d490234634a8805ac5109d4ab28b5d52a578df1b6dbdaff18c6 deviceinfo 098187f6ab56d2542f98f1b5fbcf493431f665a4300db05e859357366e39b02a3d508bfd94c1d1bd7c669261e7ef0d4e1aef1fdbb15541fe34f3f48a6caa247f initfs-hook.sh -ffa8ba47539f0b4a931c560811d7842c7f5270631066c270322859c1ef77e63fba09a8462c2533bd6d095056b2c7936c2d4fc4e225f3cff45169f121bf93d8ed 90-android.rules" +ffa8ba47539f0b4a931c560811d7842c7f5270631066c270322859c1ef77e63fba09a8462c2533bd6d095056b2c7936c2d4fc4e225f3cff45169f121bf93d8ed 90-android.rules +61e8becbf6fa7c1c6c42e481083f5981ae7af33a48cbc53e817d8ac2c6a8e4f67a54b32ae3b8f5f25f7b412165a849dc93a629110dc47b0d16927bf2a12eb7e1 modules-load.conf" diff --git a/device-samsung-i9070/deviceinfo b/device-samsung-i9070/deviceinfo index d685e7150..033a7de63 100644 --- a/device-samsung-i9070/deviceinfo +++ b/device-samsung-i9070/deviceinfo @@ -8,7 +8,6 @@ deviceinfo_date="" deviceinfo_keyboard="false" deviceinfo_nonfree="????" deviceinfo_dtb="" -deviceinfo_modules="" deviceinfo_modules_initfs="" deviceinfo_external_disk="true" deviceinfo_external_disk_install="true" diff --git a/device-samsung-i9070/modules-load.conf b/device-samsung-i9070/modules-load.conf new file mode 100644 index 000000000..eb917f82e --- /dev/null +++ b/device-samsung-i9070/modules-load.conf @@ -0,0 +1,6 @@ +# This file contains the names of kernel modules that should be loaded +# at boot time, one per line. Lines beginning with "#" are ignored. + +# wifi module +dhd + diff --git a/linux-samsung-i9070/fix_return_address.patch b/linux-samsung-i9070/00_fix_return_address.patch similarity index 100% rename from linux-samsung-i9070/fix_return_address.patch rename to linux-samsung-i9070/00_fix_return_address.patch diff --git a/linux-samsung-i9070/01_remove_ramdisks_from_initramfs.patch b/linux-samsung-i9070/01_remove_ramdisks_from_initramfs.patch new file mode 100644 index 000000000..eec4549a5 --- /dev/null +++ b/linux-samsung-i9070/01_remove_ramdisks_from_initramfs.patch @@ -0,0 +1,10 @@ +diff --git a/usr/u8500_initramfs.list b/usr/u8500_initramfs.list +index 35e8d68..c846052 100644 +--- a/usr/u8500_initramfs.list ++++ b/usr/u8500_initramfs.list +@@ -29,5 +29,3 @@ file /stage1/init source/usr/u8500_initramfs_files/init 755 0 0 + dir /sys 755 0 0 + dir /mnt 755 0 0 + dir /mnt/.lfs 755 0 0 +-file /stage1/boot.cpio ../../ramdisk.cpio 644 0 0 +-file /stage1/recovery.cpio ../../ramdisk-recovery.cpio 644 0 0 diff --git a/linux-samsung-i9070/02_reduce_lzo_compression.patch b/linux-samsung-i9070/02_reduce_lzo_compression.patch new file mode 100644 index 000000000..ad2b12e68 --- /dev/null +++ b/linux-samsung-i9070/02_reduce_lzo_compression.patch @@ -0,0 +1,26 @@ +diff --git a/scripts/Makefile.lib b/scripts/Makefile.lib +index a7ca009..808091b 100644 +--- a/scripts/Makefile.lib ++++ b/scripts/Makefile.lib +@@ -259,7 +259,7 @@ cmd_lzma = (cat $(filter-out FORCE,$^) | \ + + quiet_cmd_lzo = LZO $@ + cmd_lzo = (cat $(filter-out FORCE,$^) | \ +- lzop -9 && $(call size_append, $(filter-out FORCE,$^))) > $@ || \ ++ lzop -6 && $(call size_append, $(filter-out FORCE,$^))) > $@ || \ + (rm -f $@ ; false) + + # XZ +diff --git a/scripts/gen_initramfs_list.sh b/scripts/gen_initramfs_list.sh +index b482f16..c4e08c5 100644 +--- a/scripts/gen_initramfs_list.sh ++++ b/scripts/gen_initramfs_list.sh +@@ -245,7 +245,7 @@ case "$arg" in + echo "$output_file" | grep -q "\.lzma$" && compr="lzma -9 -f" + echo "$output_file" | grep -q "\.xz$" && \ + compr="xz --check=crc32 --lzma2=dict=1MiB" +- echo "$output_file" | grep -q "\.lzo$" && compr="lzop -9 -f" ++ echo "$output_file" | grep -q "\.lzo$" && compr="lzop -6 -f" + echo "$output_file" | grep -q "\.cpio$" && compr="cat" + shift + ;; diff --git a/linux-samsung-i9070/03_change_modules_install_dir.patch b/linux-samsung-i9070/03_change_modules_install_dir.patch new file mode 100644 index 000000000..fde11cbe9 --- /dev/null +++ b/linux-samsung-i9070/03_change_modules_install_dir.patch @@ -0,0 +1,16 @@ +diff --git a/Makefile b/Makefile +index a91053a..17ceb4a 100644 +--- a/Makefile ++++ b/Makefile +@@ -687,9 +687,9 @@ export INSTALL_PATH ?= /boot + # makefile but the argument can be passed to make if needed. + # + +-#MODLIB = $(INSTALL_MOD_PATH)/lib/modules/$(KERNELRELEASE) ++MODLIB = $(INSTALL_MOD_PATH)/lib/modules/$(KERNELRELEASE) + #MODLIB = $(INSTALL_MOD_PATH)/lib/modules/$(VERSION)$(if $(PATCHLEVEL),.$(PATCHLEVEL)$(if $(SUBLEVEL),.$(SUBLEVEL))) +-MODLIB = $(INSTALL_MOD_PATH)/lib/modules ++#MODLIB = $(INSTALL_MOD_PATH)/lib/modules + export MODLIB + + # diff --git a/linux-samsung-i9070/04_change_dhd_firmware_dir.patch b/linux-samsung-i9070/04_change_dhd_firmware_dir.patch new file mode 100644 index 000000000..3c5991081 --- /dev/null +++ b/linux-samsung-i9070/04_change_dhd_firmware_dir.patch @@ -0,0 +1,15 @@ +diff --git a/drivers/net/wireless/bcmdhd/dhd_linux.c b/drivers/net/wireless/bcmdhd/dhd_linux.c +index ed549c3..09e83f6 100644 +--- a/drivers/net/wireless/bcmdhd/dhd_linux.c ++++ b/drivers/net/wireless/bcmdhd/dhd_linux.c +@@ -361,8 +361,8 @@ uint dhd_download_fw_on_driverload = TRUE; + /* Definitions to provide path to the firmware and nvram + * example nvram_path[MOD_PARAM_PATHLEN]="/projects/wlan/nvram.txt" + */ +-char firmware_path[MOD_PARAM_PATHLEN]="/system/etc/wifi/bcmdhd_sta.bin"; +-char nvram_path[MOD_PARAM_PATHLEN]="/system/etc/wifi/nvram_net.txt"; ++char firmware_path[MOD_PARAM_PATHLEN]="/lib/firmware/postmarketos/bcmdhd_sta.bin"; ++char nvram_path[MOD_PARAM_PATHLEN]="/lib/firmware/postmarketos/nvram_net.txt"; + + /* information string to keep firmware, chio, cheip version info visiable from log */ + char info_string[MOD_PARAM_INFOLEN]; diff --git a/linux-samsung-i9070/APKBUILD b/linux-samsung-i9070/APKBUILD index 21edff5e0..c7c8101ab 100644 --- a/linux-samsung-i9070/APKBUILD +++ b/linux-samsung-i9070/APKBUILD @@ -1,4 +1,4 @@ -# Based on linux-lg-mako. Changes: +# APKBUILD based on linux-vanilla aport. Changes: # - add findutils makedepend (necessary for the initramfs) # - it builds an initramfs - do not use ramdisk.cpio and # ramdisk-recovery.cpio, in there, always use the @@ -9,6 +9,8 @@ # binary, that comes with the source # - reduce lzo compression because Alpine's busybox doesn't # support high compression +# - add kernel modules installation +# - add wifi firmware from vendor files # # Kernel config changes, based on: arch/arm/configs/janice_defconfig # - enable devtmpfs (needed for udev -> touch support in weston) @@ -16,7 +18,10 @@ _vendor=samsung _flavor=samsung-i9070 _hash="ac7219c4b8dcec7bc5a598d42c6be0db4aa36332" +_hash_vendor_files="e24d9687e7fda4f94fc6652d137ed8e703930c3a" _config="config-${_flavor}.armhf" +_src_zip="linux-${_flavor}-${_hash}.zip" +_vendor_files_zip="vendor-files-${_flavor}-${_hash_vendor_files}.zip" pkgname=linux-${_flavor} pkgver=3.0.101 @@ -24,20 +29,24 @@ case $pkgver in *.*.*) _kernver=${pkgver%.*};; *.*) _kernver=$pkgver;; esac -pkgrel=2 +pkgrel=3 arch="armhf" pkgdesc="Samsung Galaxy S Advance kernel from Epirex" url="https://github.com/Epirex/Samsung_STE_Kernel" depends="postmarketos-mkinitfs" -makedepends="perl sed installkernel bash gmp-dev bc linux-headers elfutils-dev -findutils busybox-static-armhf" +makedepends="perl sed installkernel bash gmp-dev bc linux-headers elfutils-dev busybox-static-armhf" options="!strip !check !tracedeps" install= source=" - $pkgname-$_hash.zip::https://github.com/Epirex/Samsung_STE_Kernel/archive/${_hash}.zip + $_src_zip::https://github.com/Epirex/Samsung_STE_Kernel/archive/${_hash}.zip + $_vendor_files_zip::https://github.com/Epirex/android_vendor_samsung_u8500/archive/${_hash_vendor_files}.zip $_config + 00_fix_return_address.patch + 01_remove_ramdisks_from_initramfs.patch + 02_reduce_lzo_compression.patch + 03_change_modules_install_dir.patch + 04_change_dhd_firmware_dir.patch compiler-gcc6.h - fix_return_address.patch init " subpackages="" @@ -49,6 +58,13 @@ HOSTCC="${CC:-gcc}" HOSTCC="${HOSTCC#${CROSS_COMPILE}}" ksrcdir="$srcdir/Samsung_STE_Kernel-${_hash}" +vsrcdir="$srcdir/android_vendor_samsung_u8500-${_hash_vendor_files}" + +unpack() { + cd "$srcdir" + unzip -q $_src_zip + unzip -q $_vendor_files_zip +} prepare() { local _patch_failed= @@ -78,21 +94,10 @@ prepare() { cp -v /usr/$(arch_to_hostspec $arch)/bin/busybox.static \ "$ksrcdir"/usr/u8500_initramfs_files/busybox - # do not use ramdisk.cpio and ramdisk-recovery.cpio, always use - # the initramfs from the kernel2 partition ("isorec"), so we can build - # it later and independently from the kernel. also directly boot that - # partition, not only when the recovery key combination was used. - cd "$ksrcdir"/usr/ - mv u8500_initramfs.list u8500_initramfs.list_old - grep -v "../../ramdisk" u8500_initramfs.list_old > u8500_initramfs.list \ - || return 1 + # use custom init script in the initramfs which loads the initramfs from + # the kernel2 partition ("isorec") cp -v "$srcdir"/init "$ksrcdir"/usr/u8500_initramfs_files/init || return 1 - # Reduce lzo compression because Alpine's busybox doesn't support high - # compression - sed -i -e 's/lzop -9/lzop -6/g' "$ksrcdir"/scripts/Makefile.lib || return 1 - sed -i -e 's/lzop -9/lzop -6/g' "$ksrcdir"/scripts/gen_initramfs_list.sh || return 1 - # gcc6 support cp -v "$srcdir/compiler-gcc6.h" "$ksrcdir/include/linux/" || return 1 @@ -102,11 +107,10 @@ prepare() { silentoldconfig } - - # this is so we can do: 'abuild menuconfig' to reconfigure kernel menuconfig() { cd "$srcdir"/build || return 1 + echo "--[ menuconfig ]--" make ARCH="$_carch" menuconfig cp .config "$startdir"/$_config } @@ -115,21 +119,51 @@ build() { cd "$srcdir"/build unset LDFLAGS + echo "--[ Build kernel ]--" make ARCH="$_carch" CC="${CC:-gcc}" \ - KBUILD_BUILD_VERSION="$((pkgrel + 1 ))-Alpine" \ + KBUILD_BUILD_VERSION="$((pkgrel + 1))-Alpine" \ || return 1 + + echo "--[ Build modules ]--" + # the 'no-pic' flag is necessary to avoid the + # error 'Unknown symbol _GLOBAL_OFFSET_TABLE_ (err 0)' when loading the module + make ARCH="$_carch" CC="${CC:-gcc}" CFLAGS_MODULE="-fno-pic" \ + KBUILD_BUILD_VERSION="$((pkgrel + 1))-Alpine" CONFIG_NO_ERROR_ON_MISMATCH=y \ + modules || return 1 } package() { + echo "--[ Installing kernel ]--" install -Dm644 "$srcdir/build/arch/arm/boot/zImage" \ "$pkgdir/boot/vmlinuz-$_flavor" install -D "$srcdir/build/include/config/kernel.release" \ "$pkgdir/usr/share/kernel/$_flavor/kernel.release" + + cd "$srcdir"/build + unset LDFLAGS + + echo "--[ Installing modules ]--" + make ARCH="$_carch" CC="${CC:-gcc}" \ + KBUILD_BUILD_VERSION="$((pkgrel + 1))-Alpine" CONFIG_NO_ERROR_ON_MISMATCH=y \ + INSTALL_MOD_PATH="$pkgdir" modules_install \ + || return 1 + + echo "--[ Installing vendor files ]--" + # install wifi firmware + install -Dm644 "$vsrcdir/janice/system/etc/wifi/bcmdhd_sta.bin" \ + "$pkgdir/lib/firmware/postmarketos/bcmdhd_sta.bin" + install -Dm644 "$vsrcdir/janice/system/etc/wifi/nvram_net.txt" \ + "$pkgdir/lib/firmware/postmarketos/nvram_net.txt" } sha512sums="ea4e0f56efadd12c3dab18f15214973c708f777097aecac2fb7be4118472ba6e61e2660579eec7a2b57398c3a78107c965b59a108ddf1178d481a4e353a68077 linux-samsung-i9070-ac7219c4b8dcec7bc5a598d42c6be0db4aa36332.zip -8789a6b50cb4f438aa581003a54419d70e36f7077bb0107aeaaa237bb2d603d9fc67a25e47460068547c1dcc296c64752b3b448629bd4b64645e619d314ab9bf config-samsung-i9070.armhf +387ac9d18e36bfe6e0a38afc708d573b9167bd95aaeb90268142339c252d037eec816cab345e9b9aa0cabc641988823b9ca1477bdded6c5f4a7945f351d6cac0 vendor-files-samsung-i9070-e24d9687e7fda4f94fc6652d137ed8e703930c3a.zip +65ac788fc01180b803d8110333cbd0e30e742801647d6d4d813aaa6eca0c3d216f5daef0fc9583aef5a1ea2475d48567896da8e443781a1f08ff10ff8d6ea0a6 config-samsung-i9070.armhf +ea1d3b5a234fa565e3c1a792de48f4fc4e6023d281d303c8e319c7ef28edc5739ab0e4dea0139a41f0a5c7d03e27921ccaa214fd0ac5c72245a094ce60128864 00_fix_return_address.patch +c8f12ecf578be0c4600563134079b980a1079b08ac868302af8821022befe873aa94c67b9690ba87f5967f0a48939d15e871dc2d2862bed7b6a1d0c9a95cfd8f 01_remove_ramdisks_from_initramfs.patch +ef5b912c26fea4ab882592bdf7487942c64b123de8d25d08d976f29743f311742ee2f773bf2d110ddb5095f254dbb0bd4487c5cfce77311929082599199e7ebd 02_reduce_lzo_compression.patch +27bba6d070db6f499d030680c020906fc3238dc60d90a9b2f0f3a355ef15beb227c1cf48b7858156264fe10f7943772ed00a837be36ba4b80de8199f0383e688 03_change_modules_install_dir.patch +47533412cc91d2ead046039c90180ebc459e157017be85dca69cd882a183963448beb973f2cb7eaccbcd35354b0ed6a668131cd39ea30393dd52fd93b7e26815 04_change_dhd_firmware_dir.patch d80980e9474c82ba0ef1a6903b434d8bd1b092c40367ba543e72d2c119301c8b2d05265740e4104ca1ac5d15f6c4aa49e8776cb44264a9a28dc551e0d1850dcc compiler-gcc6.h -ea1d3b5a234fa565e3c1a792de48f4fc4e6023d281d303c8e319c7ef28edc5739ab0e4dea0139a41f0a5c7d03e27921ccaa214fd0ac5c72245a094ce60128864 fix_return_address.patch ef01c51c138239a49c1d00ae0074a07fed267d64934cf3d436a8ff057b91692ee2d040a45eacbb0dc62d5017a708c4dca2fadc282c850fa72aeebcfa787e2cbc init" diff --git a/linux-samsung-i9070/config-samsung-i9070.armhf b/linux-samsung-i9070/config-samsung-i9070.armhf index e7c3d8eb9..5f94a626b 100644 --- a/linux-samsung-i9070/config-samsung-i9070.armhf +++ b/linux-samsung-i9070/config-samsung-i9070.armhf @@ -1153,8 +1153,8 @@ CONFIG_WIFI_CONTROL_FUNC=y CONFIG_BCM4330=y # CONFIG_BCM4334 is not set # CONFIG_BCM43241 is not set -CONFIG_BCMDHD_FW_PATH="/system/etc/firmware/fw_bcmdhd.bin" -CONFIG_BCMDHD_NVRAM_PATH="/system/etc/wifi/bcmdhd.cal" +CONFIG_BCMDHD_FW_PATH="/lib/firmware/postmarketos/bcmdhd_sta.bin" +CONFIG_BCMDHD_NVRAM_PATH="/lib/firmware/postmarketos/nvram_net.txt" CONFIG_BROADCOM_WIFI_RESERVED_MEM=y CONFIG_WLAN_REGION_CODE=100 # CONFIG_HOSTAP is not set