From 5da25bc8ffff9108b9ac864bdb3f16db37bb91d7 Mon Sep 17 00:00:00 2001 From: William O-D Date: Sat, 23 Dec 2017 21:37:41 +0000 Subject: [PATCH] samsung-espresso10: Added wifi (WIP), touch and usb support (#1034) --- device/device-samsung-espresso10/APKBUILD | 6 ++-- device/device-samsung-espresso10/deviceinfo | 5 ++- ...pilation-error-for-rndis_bind_config.patch | 25 -------------- device/linux-samsung-espresso10/APKBUILD | 18 +++++----- .../config-samsung-espresso10.armhf | 30 ++++++++++------- firmware/firmware-samsung-espresso10/APKBUILD | 33 +++++++++++++++++++ 6 files changed, 64 insertions(+), 53 deletions(-) delete mode 100644 device/linux-samsung-espresso10/02-Fixed-compilation-error-for-rndis_bind_config.patch create mode 100644 firmware/firmware-samsung-espresso10/APKBUILD diff --git a/device/device-samsung-espresso10/APKBUILD b/device/device-samsung-espresso10/APKBUILD index a441626c4..612c51a80 100644 --- a/device/device-samsung-espresso10/APKBUILD +++ b/device/device-samsung-espresso10/APKBUILD @@ -2,12 +2,12 @@ pkgname="device-samsung-espresso10" pkgdesc="Samsung Galaxy Tab 2 (10.1 inch)" pkgver=0.1 -pkgrel=0 +pkgrel=1 url="https://postmarketos.org" license="MIT" arch="noarch" options="!check" -depends="linux-samsung-espresso10 mkbootimg" +depends="linux-samsung-espresso10 firmware-samsung-espresso10 mkbootimg" makedepends="devicepkg-dev" source="deviceinfo" @@ -19,4 +19,4 @@ package() { devicepkg_package $startdir $pkgname } -sha512sums="db52de8c130d502aa662a39684012949edfa6169a86d7fee987d1e3f7d9522f4357689fc5a68e4c451989330451e963e221b4b4fa3999c96becf81a3fc2db991 deviceinfo" +sha512sums="52b9cd540941d0d4059c90483e0e5d7f6b742ab012201add20a6602836e1831bd5fef8c930f3084f65da4a9c22ebaa5109dfa4d2eacd86c259b967eb4fedb0cb deviceinfo" diff --git a/device/device-samsung-espresso10/deviceinfo b/device/device-samsung-espresso10/deviceinfo index f5b46f3cd..cf68aba01 100644 --- a/device/device-samsung-espresso10/deviceinfo +++ b/device/device-samsung-espresso10/deviceinfo @@ -15,8 +15,8 @@ deviceinfo_keyboard="false" deviceinfo_external_disk="true" deviceinfo_screen_width="1280" deviceinfo_screen_height="800" -deviceinfo_dev_touchscreen="" -deviceinfo_dev_touchscreen_calibration="" +deviceinfo_dev_touchscreen="/dev/input/event0" +deviceinfo_dev_touchscreen_calibration="1.007935 -0.019309 18.065613 -0.003218 1.021773 4.029175" deviceinfo_dev_keyboard="" # Bootloader related @@ -31,4 +31,3 @@ deviceinfo_flash_offset_second="0x00f00000" deviceinfo_flash_offset_tags="0x00000100" deviceinfo_flash_pagesize="2048" deviceinfo_flash_heimdall_partition_system="FACTORYFS" - diff --git a/device/linux-samsung-espresso10/02-Fixed-compilation-error-for-rndis_bind_config.patch b/device/linux-samsung-espresso10/02-Fixed-compilation-error-for-rndis_bind_config.patch deleted file mode 100644 index 2745b0515..000000000 --- a/device/linux-samsung-espresso10/02-Fixed-compilation-error-for-rndis_bind_config.patch +++ /dev/null @@ -1,25 +0,0 @@ -From e11f599d4985fdf516733423cf086e6454902e50 Mon Sep 17 00:00:00 2001 -From: Robill Tian Supatrio -Date: Sun, 8 Jan 2012 12:51:32 +0800 -Subject: [PATCH] Fixed compilation error for rndis_bind_config. - ---- - drivers/usb/gadget/ether.c | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -diff --git a/drivers/usb/gadget/ether.c b/drivers/usb/gadget/ether.c -index 1690c9d..53ee2c5 100644 ---- a/drivers/usb/gadget/ether.c -+++ b/drivers/usb/gadget/ether.c -@@ -246,7 +246,7 @@ static int __init rndis_do_config(struct usb_configuration *c) - c->bmAttributes |= USB_CONFIG_ATT_WAKEUP; - } - -- return rndis_bind_config(c, hostaddr); -+ return rndis_bind_config(c, hostaddr, 12345, "android-arm"); - } - - static struct usb_configuration rndis_config_driver = { --- -1.7.4.1 - diff --git a/device/linux-samsung-espresso10/APKBUILD b/device/linux-samsung-espresso10/APKBUILD index 7cb9ad645..54041b643 100644 --- a/device/linux-samsung-espresso10/APKBUILD +++ b/device/linux-samsung-espresso10/APKBUILD @@ -2,7 +2,7 @@ pkgname="linux-samsung-espresso10" pkgver=3.0.101 -pkgrel=0 +pkgrel=1 pkgdesc="Samsung Galaxy Tab 2 (10.1 inch) kernel fork" arch="armhf" _carch="arm" @@ -14,17 +14,16 @@ makedepends="perl sed installkernel bash gmp-dev bc linux-headers elfutils-dev" HOSTCC="${CC:-gcc}" HOSTCC="${HOSTCC#${CROSS_COMPILE}}" -# Source - Use omnirom kernel (seems to have more fixes) -_repository="android_kernel_samsung_espresso10" -_commit="3d5cf7e95d29d32623747b7cae37bd7c1db151ff" +# Source - Use unlegacy kernel +_repository="android_kernel_samsung_espresso" +_commit="19d2fd25e2416ed04c287387ade7048047bf7b18" _config="config-${_flavor}.${arch}" source=" -$pkgname-$_commit.tar.gz::https://github.com/omnirom/${_repository}/archive/${_commit}.tar.gz +$pkgname-$_commit.tar.gz::https://github.com/Unlegacy-Android/${_repository}/archive/${_commit}.tar.gz $_config compiler-gcc6.h 01_fix_aid_net_on_apn_disable.patch - 02-Fixed-compilation-error-for-rndis_bind_config.patch " builddir="$srcdir/${_repository}-${_commit}" @@ -77,8 +76,7 @@ package() { fi } -sha512sums="3c869ec19a36e97c9ed63952d5959205ed3f4121d51d79e22b40596ef61d1601ef0a0bf13362c0f5451867f4b59d0a8511d6870fb6c9948a609140df1579fd27 linux-samsung-espresso10-3d5cf7e95d29d32623747b7cae37bd7c1db151ff.tar.gz -e2e28094b0ea57156e0484d1319266852b122b3599e37dce7a48dd05dd574636317acb7ab90c869c91a9eec6b608e7c48cad806e482d59f515d2b8e9cdbf1a95 config-samsung-espresso10.armhf +sha512sums="86d77d7f1004e1b0ec63e95132b853ad6e03d3e55587bbbed91d64d95ba6f9bb82ac5b77162f8e89b16c4f8db491d4e8ce6ed16b7572bb6f99ce46144dac619e linux-samsung-espresso10-19d2fd25e2416ed04c287387ade7048047bf7b18.tar.gz +d308baf0f31b5988930e6ba3e938567807144b32189e1692ec3a3679cf16fd520255add54d7c514446a7dc9554f85da7360e7bb7bba572f7dd94cc5fdb4e8a46 config-samsung-espresso10.armhf d80980e9474c82ba0ef1a6903b434d8bd1b092c40367ba543e72d2c119301c8b2d05265740e4104ca1ac5d15f6c4aa49e8776cb44264a9a28dc551e0d1850dcc compiler-gcc6.h -1cae09c775d787e877f82cb164b5d68530f4bd9b108b7abaf8192bd85a3d8975456762ce9f563fa766b1c03519e09ef93e177fd6972e439e4aa0c3a5709ea691 01_fix_aid_net_on_apn_disable.patch -822e41a0c4b4f00e1f9e5e847378504e9a4b113a360b73e72998e70cc5a47cac42489cfd2475f6924e237dfe4791f19a20169c224680ab11a7c272a866e361ac 02-Fixed-compilation-error-for-rndis_bind_config.patch" +1cae09c775d787e877f82cb164b5d68530f4bd9b108b7abaf8192bd85a3d8975456762ce9f563fa766b1c03519e09ef93e177fd6972e439e4aa0c3a5709ea691 01_fix_aid_net_on_apn_disable.patch" diff --git a/device/linux-samsung-espresso10/config-samsung-espresso10.armhf b/device/linux-samsung-espresso10/config-samsung-espresso10.armhf index 65b1ca9fa..955895394 100644 --- a/device/linux-samsung-espresso10/config-samsung-espresso10.armhf +++ b/device/linux-samsung-espresso10/config-samsung-espresso10.armhf @@ -159,6 +159,10 @@ CONFIG_HAVE_REGS_AND_STACK_ACCESS_API=y CONFIG_HAVE_CLK=y CONFIG_HAVE_DMA_API_DEBUG=y CONFIG_HAVE_HW_BREAKPOINT=y +CONFIG_HAVE_ARCH_MMAP_RND_BITS=y +CONFIG_ARCH_MMAP_RND_BITS_MIN=8 +CONFIG_ARCH_MMAP_RND_BITS_MAX=16 +CONFIG_ARCH_MMAP_RND_BITS=8 # # GCOV-based kernel profiling @@ -174,6 +178,7 @@ CONFIG_MODULE_UNLOAD=y CONFIG_MODULE_FORCE_UNLOAD=y CONFIG_MODVERSIONS=y # CONFIG_MODULE_SRCVERSION_ALL is not set +# CONFIG_MODULE_SIG is not set CONFIG_STOP_MACHINE=y CONFIG_BLOCK=y CONFIG_LBDAF=y @@ -749,6 +754,7 @@ CONFIG_NF_CONNTRACK_PROC_COMPAT=y CONFIG_IP_NF_IPTABLES=y CONFIG_IP_NF_MATCH_AH=y CONFIG_IP_NF_MATCH_ECN=y +CONFIG_IP_NF_MATCH_RPFILTER=y CONFIG_IP_NF_MATCH_TTL=y CONFIG_IP_NF_FILTER=y CONFIG_IP_NF_TARGET_REJECT=y @@ -795,6 +801,7 @@ CONFIG_IP6_NF_IPTABLES=y # CONFIG_IP6_NF_MATCH_HL is not set # CONFIG_IP6_NF_MATCH_IPV6HEADER is not set # CONFIG_IP6_NF_MATCH_MH is not set +CONFIG_IP6_NF_MATCH_RPFILTER=y # CONFIG_IP6_NF_MATCH_RT is not set # CONFIG_IP6_NF_TARGET_HL is not set CONFIG_IP6_NF_TARGET_LOG=y @@ -1007,6 +1014,7 @@ CONFIG_MISC_DEVICES=y # CONFIG_INTEL_MID_PTI is not set # CONFIG_ICS932S401 is not set # CONFIG_ENCLOSURE_SERVICES is not set +CONFIG_SAMSUNG_JACK=y # CONFIG_APDS9802ALS is not set # CONFIG_ISL29003 is not set # CONFIG_ISL29020 is not set @@ -1024,7 +1032,6 @@ CONFIG_UID_STAT=y # CONFIG_APANIC is not set # CONFIG_OMAP_DIE_TEMP_SENSOR is not set # CONFIG_CDC_TCXO is not set -CONFIG_SAMSUNG_JACK=y CONFIG_SEC_30PIN_CON=y CONFIG_UID_CPUTIME=y # CONFIG_C2PORT is not set @@ -1131,10 +1138,10 @@ CONFIG_WLAN=y CONFIG_WIFI_CONTROL_FUNC=y # CONFIG_ATH_COMMON is not set # CONFIG_BCM4329 is not set -CONFIG_BCMDHD=m +CONFIG_BCMDHD=y # CONFIG_BCM4339 is not set -CONFIG_BCMDHD_FW_PATH="/system/vendor/firmware/fw_bcmdhd.bin" -CONFIG_BCMDHD_NVRAM_PATH="/system/etc/wifi/nvram_net.txt" +CONFIG_BCMDHD_FW_PATH="/lib/firmware/postmarketos/bcmdhd_sta.bin" +CONFIG_BCMDHD_NVRAM_PATH="/lib/firmware/postmarketos/nvram_net.txt" # CONFIG_DHD_USE_STATIC_BUF is not set CONFIG_DHD_USE_SCHED_SCAN=y # CONFIG_HOSTAP is not set @@ -1670,7 +1677,7 @@ CONFIG_TILER_EXPOSE_SSPTR=y # # Graphics support # -# CONFIG_DRM is not set +CONFIG_DRM=y CONFIG_ION=y CONFIG_ION_OMAP=y # CONFIG_VGASTATE is not set @@ -1920,7 +1927,7 @@ CONFIG_USB_EHCI_HCD_OMAP=y # CONFIG_USB_HWA_HCD is not set CONFIG_USB_MUSB_HDRC=y # CONFIG_USB_MUSB_TUSB6010 is not set -CONFIG_USB_MUSB_OMAP2PLUS=m +CONFIG_USB_MUSB_OMAP2PLUS=y # CONFIG_USB_MUSB_AM35X is not set # CONFIG_USB_MUSB_HOST is not set # CONFIG_USB_MUSB_PERIPHERAL is not set @@ -2053,7 +2060,7 @@ CONFIG_USB_SERIAL_PL2303=y CONFIG_USB_GADGET=y # CONFIG_USB_GADGET_DEBUG is not set # CONFIG_USB_GADGET_DEBUG_FILES is not set -CONFIG_USB_GADGET_DEBUG_FS=y +# CONFIG_USB_GADGET_DEBUG_FS is not set CONFIG_USB_GADGET_VBUS_DRAW=500 CONFIG_USB_GADGET_SELECTED=y # CONFIG_USB_GADGET_FUSB300 is not set @@ -2065,9 +2072,7 @@ CONFIG_USB_GADGET_SELECTED=y CONFIG_USB_GADGET_DUALSPEED=y # CONFIG_USB_ZERO is not set # CONFIG_USB_AUDIO is not set -CONFIG_USB_ETH=y -CONFIG_USB_ETH_RNDIS=y -# CONFIG_USB_ETH_EEM is not set +# CONFIG_USB_ETH is not set # CONFIG_USB_G_NCM is not set # CONFIG_USB_GADGETFS is not set # CONFIG_USB_FUNCTIONFS is not set @@ -2076,7 +2081,7 @@ CONFIG_USB_ETH_RNDIS=y # CONFIG_USB_G_SERIAL is not set # CONFIG_USB_MIDI_GADGET is not set # CONFIG_USB_G_PRINTER is not set -# CONFIG_USB_G_ANDROID is not set +CONFIG_USB_G_ANDROID=y # CONFIG_USB_CDC_COMPOSITE is not set # CONFIG_USB_G_NOKIA is not set # CONFIG_USB_G_MULTI is not set @@ -2372,7 +2377,7 @@ CONFIG_MISC_FILESYSTEMS=y # CONFIG_HPFS_FS is not set # CONFIG_QNX4FS_FS is not set # CONFIG_ROMFS_FS is not set -CONFIG_PSTORE=y +# CONFIG_PSTORE is not set # CONFIG_SYSV_FS is not set # CONFIG_UFS_FS is not set CONFIG_F2FS_FS=y @@ -2562,6 +2567,7 @@ CONFIG_DEBUG_USER=y CONFIG_KEYS=y CONFIG_KEYS_DEBUG_PROC_KEYS=y # CONFIG_SECURITY_DMESG_RESTRICT is not set +# CONFIG_SECURITY_PERF_EVENTS_RESTRICT is not set CONFIG_SECURITY=y # CONFIG_SECURITYFS is not set CONFIG_SECURITY_NETWORK=y diff --git a/firmware/firmware-samsung-espresso10/APKBUILD b/firmware/firmware-samsung-espresso10/APKBUILD new file mode 100644 index 000000000..ab5998b34 --- /dev/null +++ b/firmware/firmware-samsung-espresso10/APKBUILD @@ -0,0 +1,33 @@ +pkgname=firmware-samsung-espresso10 +pkgver=1 +pkgrel=0 +pkgdesc="Samsung Galaxy Tab 2 Firmware" +url="https://github.com/TheMuppets/proprietary_vendor_samsung" +arch="noarch" +license="proprietary" +options="!check" + +# Source +_files=" + bcmdhd_apsta.bin + bcmdhd_p2p.bin + bcmdhd_sta.bin + nvram_net.txt +" +_commit="89fe5020dbaf2920dece954ce86aa2edf3389852" +_url="https://github.com/TheMuppets/proprietary_vendor_samsung/raw/$_commit/espresso-common/proprietary/system/etc/wifi" +source="" +for _i in $_files; do + source="$source $pkgname-$_commit-$_i::$_url/$_i"; +done + +package() { + for _i in $_files; do + install -Dm644 "$srcdir/$pkgname-$_commit-$_i" \ + "$pkgdir/lib/firmware/postmarketos/$_i" + done +} +sha512sums="a4c740f11cdc7123adeed80c616c35bbdce42c8e71cbb7cfb447f8c4537a45cf0fb0419a86d02a834ae518a6674b9cd1e9de05e0b4ec8c7e6e5c40fbd32d1a41 firmware-samsung-espresso10-89fe5020dbaf2920dece954ce86aa2edf3389852-bcmdhd_apsta.bin +4a18896521a735082e2e8bd51ea137be2cfabce32dfad384132f7fdca001852878439de0bd8b793dc751651592b7b78799c393d18a5cb66a36d5038dd8d4fbeb firmware-samsung-espresso10-89fe5020dbaf2920dece954ce86aa2edf3389852-bcmdhd_p2p.bin +bd2729c2cbc3c52e1abc5c6e0f4ba32b3b77711bc73c76aece591f8de642da69f0edb8620e422e102e0eaced8c9d76870ac63dfc7113e318ad8aa2633a32b10f firmware-samsung-espresso10-89fe5020dbaf2920dece954ce86aa2edf3389852-bcmdhd_sta.bin +24c0eab68996c9f80453cf01c8059ec6672175668a13ebd91abcd33bf56afd94c7564d0f6e6d2b87d3a44171ca3dce895ffd13b61d29ae583b76635998e4042f firmware-samsung-espresso10-89fe5020dbaf2920dece954ce86aa2edf3389852-nvram_net.txt"