diff --git a/device-nokia-rx51/APKBUILD b/device-nokia-rx51/APKBUILD index 104c012a5..359689f6d 100644 --- a/device-nokia-rx51/APKBUILD +++ b/device-nokia-rx51/APKBUILD @@ -9,7 +9,7 @@ depends="linux-nokia-rx51 uboot-tools" makedepends="uboot-tools" install="" subpackages="" -source="deviceinfo initfs-hook.sh profile.sh uboot-script.cmd" +source="deviceinfo uboot-script.cmd" options="!check" build() { @@ -20,15 +20,9 @@ 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"/profile.sh \ - "$pkgdir"/etc/profile.d/00-$pkgname.sh - #install -D -m644 "$srcdir"/boot.scr \ - # "$pkgdir"/boot/boot.scr + install -D -m644 "$srcdir"/boot.scr \ + "$pkgdir"/boot/boot.scr } -sha512sums="52ae4fc3317774fc6e668188857e9eb2c80a4612fc92b895b2bf78d2d377a6f6fe387be5f003cf98ac14c31aaf4a2677713b01f3cddac03cf34ce5c2b83e0b72 deviceinfo -8590967fa10388a890fdfafdb1070b9ab22dc89e06a3a8834806c772191e3b67de7b914b0d68e5ddf581cee715cb90f3f24abcb8762c415ff328c6da23e55d52 initfs-hook.sh -c3d0182161c33047e0af4fd7cc557037e10380896a771446f055a13813e50e4e6c9d5992de7b275a8373a053cca02cb96bcb50c732709a2e9909f903b5fba249 profile.sh +sha512sums="314b4241c4f081006b7dc126d3d088ceb1c57b69791c13c7d7e1393dd3627bf01ad29a2f9fda475631a857900d6e90524d54f43c3efc7bf77a0e435975e1d0e8 deviceinfo 011e85537f497c2888f876a63bec13e3a2853a5047a0692515d6108cee2a2b90e70fb234f9c0e67a11d64abd3a15cade0864d725548722df910d6d1cbb1216e4 uboot-script.cmd" diff --git a/device-nokia-rx51/deviceinfo b/device-nokia-rx51/deviceinfo index ca95913b9..1e0a72a27 100644 --- a/device-nokia-rx51/deviceinfo +++ b/device-nokia-rx51/deviceinfo @@ -3,10 +3,10 @@ # Use only double quotes. deviceinfo_format_version="0" -deviceinfo_name="Google Nexus 5" -deviceinfo_manufacturer="LG" +deviceinfo_name="Nokia N900" +deviceinfo_manufacturer="Nokia" deviceinfo_date="" -deviceinfo_keyboard="false" +deviceinfo_keyboard="true" deviceinfo_nonfree="????" deviceinfo_dtb="" deviceinfo_modules="" @@ -15,15 +15,4 @@ deviceinfo_external_disk="true" deviceinfo_external_disk_install="true" deviceinfo_flash_methods="0xFFFF" deviceinfo_generate_legacy_uboot_initfs="true" -deviceinfo_arch="armhf" - - -# You can for example extract these from an existing boot.img -deviceinfo_flash_offset_base="0" -deviceinfo_flash_offset_kernel="0x00008000" -deviceinfo_flash_offset_ramdisk="0x2900000" -deviceinfo_flash_offset_second="0x00f00000" -deviceinfo_flash_offset_tags="0x02700000" -deviceinfo_flash_cmdline="console=ttyHSL0,115200,n8 androidboot.hardware=hammerhead user_debug=31 maxcpus=2 msm_watchdog_v2.enable=1" -deviceinfo_flash_pagesize="2048" - +deviceinfo_arch="armhf" \ No newline at end of file diff --git a/device-nokia-rx51/initfs-hook.sh b/device-nokia-rx51/initfs-hook.sh deleted file mode 100644 index e7a2ccc87..000000000 --- a/device-nokia-rx51/initfs-hook.sh +++ /dev/null @@ -1,4 +0,0 @@ -#!/bin/sh - -# set framebuffer resolution -cat /sys/class/graphics/fb0/modes > /sys/class/graphics/fb0/mode diff --git a/device-nokia-rx51/profile.sh b/device-nokia-rx51/profile.sh deleted file mode 100644 index 01385a012..000000000 --- a/device-nokia-rx51/profile.sh +++ /dev/null @@ -1,30 +0,0 @@ -#!/bin/sh - -# Dirty hacks, necessary to get a working demo... -if [ -e /etc/xdg/weston/weston.ini ]; then - rm /etc/xdg/weston/weston.ini - echo "WARNING: xwayland does not work yet on lg-mako (probably" - echo "because of bad framebuffer drivers)" - echo "=> Deleted /etc/xdg/weston/weston.ini as workaround" -fi -if [ -e /lib/udev/v4l_id ]; then - mv /lib/udev/v4l_id /lib/udev/v4l_id_ - echo "WARNING: v4l_id hangs with the current kernel." - echo "=> Moved it from /lib/udev/v4l_id to /lib/udev/v4l_id_" -fi - - -# Run a few weston demos, because the postmarketos-demos program depends -# on xwayland for now (Alpine's GTK3 isn't configured for Wayland -# support yet.) -if [ $(tty) = "/dev/tty1" ]; then - ( - sleep 3; - export XDG_RUNTIME_DIR=/tmp/0-runtime-dir - weston-smoke & - weston-simple-damage & - weston-editor & - weston-terminal --shell=/usr/bin/htop & - ) > /dev/null & -fi - diff --git a/linux-nokia-rx51/compiler-gcc6.h b/linux-nokia-rx51/compiler-gcc6.h deleted file mode 100644 index 844706318..000000000 --- a/linux-nokia-rx51/compiler-gcc6.h +++ /dev/null @@ -1,69 +0,0 @@ -// SOURCE: -// https://github.com/NextThingCo/CHIP-u-boot/issues/10#issuecomment-287515505 - -#ifndef __LINUX_COMPILER_H -#error "Please don't include directly, include instead." -#endif - -#define __used __attribute__((__used__)) -#define __must_check __attribute__((warn_unused_result)) -#define __compiler_offsetof(a, b) __builtin_offsetof(a, b) - -/* Mark functions as cold. gcc will assume any path leading to a call - to them will be unlikely. This means a lot of manual unlikely()s - are unnecessary now for any paths leading to the usual suspects - like BUG(), printk(), panic() etc. [but let's keep them for now for - older compilers] - - Early snapshots of gcc 4.3 don't support this and we can't detect this - in the preprocessor, but we can live with this because they're unreleased. - Maketime probing would be overkill here. - - gcc also has a __attribute__((__hot__)) to move hot functions into - a special section, but I don't see any sense in this right now in - the kernel context */ -#define __cold __attribute__((__cold__)) - -#define __UNIQUE_ID(prefix) __PASTE(__PASTE(__UNIQUE_ID_, prefix), __COUNTER__) - -#ifndef __CHECKER__ -# define __compiletime_warning(message) __attribute__((warning(message))) -# define __compiletime_error(message) __attribute__((error(message))) -#endif /* __CHECKER__ */ - -/* - * Mark a position in code as unreachable. This can be used to - * suppress control flow warnings after asm blocks that transfer - * control elsewhere. - * - * Early snapshots of gcc 4.5 don't support this and we can't detect - * this in the preprocessor, but we can live with this because they're - * unreleased. Really, we need to have autoconf for the kernel. - */ -#define unreachable() __builtin_unreachable() - -/* Mark a function definition as prohibited from being cloned. */ -#define __noclone __attribute__((__noclone__)) - -/* - * Tell the optimizer that something else uses this function or variable. - */ -#define __visible __attribute__((externally_visible)) - -/* - * GCC 'asm goto' miscompiles certain code sequences: - * - * http://gcc.gnu.org/bugzilla/show_bug.cgi?id=58670 - * - * Work it around via a compiler barrier quirk suggested by Jakub Jelinek. - * - * (asm goto is automatically volatile - the naming reflects this.) - */ -#define asm_volatile_goto(x...) do { asm goto(x); asm (""); } while (0) - -#ifdef CONFIG_ARCH_USE_BUILTIN_BSWAP -#define __HAVE_BUILTIN_BSWAP32__ -#define __HAVE_BUILTIN_BSWAP64__ -#define __HAVE_BUILTIN_BSWAP16__ -#endif /* CONFIG_ARCH_USE_BUILTIN_BSWAP */ - diff --git a/linux-nokia-rx51/gpu-msm-fix-gcc5-compile.patch b/linux-nokia-rx51/gpu-msm-fix-gcc5-compile.patch deleted file mode 100644 index 91b17cd76..000000000 --- a/linux-nokia-rx51/gpu-msm-fix-gcc5-compile.patch +++ /dev/null @@ -1,33 +0,0 @@ -source: -https://github.com/ShinySide/HispAsian_Lollipop_G6/commit/b7756b6fc4bb728722b14d2dfdbaf1dc843812e9 - -* These need to be static to avoid these errors: - -drivers/built-in.o: In function `.LANCHOR1': -msm_iommu_sec.c:(.data+0x9298): undefined reference to `kgsl_iommu_sync_lock' -msm_iommu_sec.c:(.data+0x929c): undefined reference to `kgsl_iommu_sync_unlock' -Makefile:877: recipe for target '.tmp_vmlinux1' failed -make: *** [.tmp_vmlinux1] Error 1 - -Signed-off-by: Chet Kener - ---- a/drivers/gpu/msm/kgsl_iommu.c -+++ b/drivers/gpu/msm/kgsl_iommu.c -@@ -1010,7 +1010,7 @@ static int kgsl_iommu_init_sync_lock(struct kgsl_mmu *mmu) - * - * Return - int - number of commands. - */ --inline unsigned int kgsl_iommu_sync_lock(struct kgsl_mmu *mmu, -+static inline unsigned int kgsl_iommu_sync_lock(struct kgsl_mmu *mmu, - unsigned int *cmds) - { - struct kgsl_device *device = mmu->device; -@@ -1080,7 +1080,7 @@ inline unsigned int kgsl_iommu_sync_lock(struct kgsl_mmu *mmu, - * - * Return - int - number of commands. - */ --inline unsigned int kgsl_iommu_sync_unlock(struct kgsl_mmu *mmu, -+static inline unsigned int kgsl_iommu_sync_unlock(struct kgsl_mmu *mmu, - unsigned int *cmds) - { - struct kgsl_device *device = mmu->device;