Browse Source

Revert "Play with appended dtb's for the pi2 and pi3"

This reverts commit 2bfd309f26483eeadb318ed285dfffe247110bfb.
Donald Carr 6 years ago
parent
commit
fac60ca9af
2 changed files with 6 additions and 7 deletions
  1. 3 3
      PKGBUILD
  2. 3 4
      rpi2

+ 3 - 3
PKGBUILD

@@ -7,7 +7,7 @@ pkgname=linux-spudd
 # The firmware the kernel produces blows: don't falsify this lightly
 # "linux-firmware=20170309.695f2d6-1"
 pkgrel=1
-pkgver=4.19.r1936.g943bdfd15951
+pkgver=4.19.r1935.g5cc3e97994c9
 pkgdesc="Kernel build from head"
 arch=("x86_64" "aarch64" "armv7h")
 license=("GPL2.1")
@@ -45,9 +45,9 @@ package() {
 
   mkdir -p ${boot_dir}
   if [ "${LOCAL_PI_VER}" = "3" ]; then
-    cat arch/arm64/boot/Image arch/arm/boot/dts/bcm2837-rpi-3-b-plus.dtb > ${boot_dir}/ImageSpudd
+    cp arch/arm64/boot/Image ${boot_dir}/ImageSpudd
   elif [ "${LOCAL_PI_VER}" = "2" ]; then
-    cat arch/arm/boot/zImage arch/arm/boot/dts/bcm2837-rpi-3-b-plus.dtb > ${boot_dir}/vmlinuz-spudd
+    cp arch/arm/boot/zImage ${boot_dir}/vmlinuz-spudd
   else
     cp arch/x86/boot/bzImage ${boot_dir}/vmlinuz-spudd
   fi

+ 3 - 4
rpi2

@@ -4,10 +4,10 @@
 #
 
 #
-# Compiler: aarch64-rpi3-linux-gnu-gcc (crosstool-NG 1.23.0.582-e215e3a) 8.2.0
+# Compiler: armv7-rpi2-linux-gnueabihf-gcc (crosstool-NG crosstool-ng-1.22.0-169-g87eb166) 6.1.0
 #
 CONFIG_CC_IS_GCC=y
-CONFIG_GCC_VERSION=80200
+CONFIG_GCC_VERSION=60100
 CONFIG_CLANG_VERSION=0
 CONFIG_IRQ_WORK=y
 CONFIG_BUILDTIME_EXTABLE_SORT=y
@@ -471,8 +471,7 @@ CONFIG_ATAGS=y
 # CONFIG_DEPRECATED_PARAM_STRUCT is not set
 CONFIG_ZBOOT_ROM_TEXT=0x0
 CONFIG_ZBOOT_ROM_BSS=0x0
-CONFIG_ARM_APPENDED_DTB=y
-# CONFIG_ARM_ATAG_DTB_COMPAT is not set
+# CONFIG_ARM_APPENDED_DTB is not set
 CONFIG_CMDLINE="dwc_otg.lpm_enable=0 console=ttyAMA0,115200 kgdboc=ttyAMA0,115200 root=/dev/mmcblk0p2 rootfstype=ext3 rootwait"
 CONFIG_CMDLINE_FROM_BOOTLOADER=y
 # CONFIG_CMDLINE_EXTEND is not set