add defconfig from @neochapay

Fixes #1

Signed-off-by: Dan Johansen <strit@manjaro.org>

PKGBUILD

@@ -3,7 +3,7 @@
 
 pkgname=uboot-pinetab
 pkgver=2021.10
-pkgrel=1
+pkgrel=2
 pkgdesc="U-Boot for Pine64 PineTab"
 arch=('aarch64')
 url='http://www.denx.de/wiki/U-Boot/WebHome'
@@ -13,32 +13,53 @@ provides=('uboot')
 conflicts=('uboot')
 install=${pkgname}.install
 _tfaver=2.5
-source=("ftp://ftp.denx.de/pub/u-boot/u-boot-${pkgver/rc/-rc}.tar.bz2"
-        "https://git.trustedfirmware.org/TF-A/trusted-firmware-a.git/snapshot/trusted-firmware-a-$_tfaver.tar.gz")
+source=("https://ftp.denx.de/pub/u-boot/u-boot-${pkgver/rc/-rc}.tar.bz2"
+        "https://git.trustedfirmware.org/TF-A/trusted-firmware-a.git/snapshot/trusted-firmware-a-$_tfaver.tar.gz"
+        "pinetab_defconfig")
 md5sums=('f1392080facf59dd2c34096a5fd95d4c'
-         'cd0455f0dcd4161201074bacb93446b1')
+         'cd0455f0dcd4161201074bacb93446b1'
+         '0c29da32ba01d2e2567f0aa7b98b6a22')
 
 build() {
+  # Avoid build warnings by editing a .config option in place instead of
+  # appending an option to .config, if an option is already present
+  update_config() {
+    if ! grep -q "^$1=$2$" .config; then
+      if grep -q "^# $1 is not set$" .config; then
+        sed -i -e "s/^# $1 is not set$/$1=$2/g" .config
+      elif grep -q "^$1=" .config; then
+        sed -i -e "s/^$1=.*/$1=$2/g" .config
+      else
+        echo "$1=$2" >> .config
+      fi
+    fi
+  }
+
   unset CFLAGS CXXFLAGS CPPFLAGS LDFLAGS
 
   cd trusted-firmware-a-${_tfaver}
-
+  
+  echo -e "\nBuilding TF-A for Pine64 PineTab...\n"
   make PLAT=sun50i_a64 DEBUG=1 bl31
   cp build/sun50i_a64/debug/bl31.bin ../u-boot-${pkgver/rc/-rc}
 
   cd ../u-boot-${pkgver/rc/-rc}
 
+  # Copy pinetab_defconfig into uboot source tree
+  cp ${srcdir}/pinetab_defconfig configs/pinetab_defconfig
+
   # This builds the PineTab uboot.
-  echo "Building U-Boot for PineTab..."
-  make distclean
-  make sopine_baseboard_defconfig
-  echo 'CONFIG_IDENT_STRING=" Manjaro ARM"' >> .config
+  echo -e "\nBuilding U-Boot for Pine64 PineTab...\n"
+  make pinetab_defconfig
+  
+  update_config 'CONFIG_IDENT_STRING' '" Manjaro Linux ARM"'
   make SCP=/dev/null EXTRAVERSION=-${pkgrel}
   cat u-boot-sunxi-with-spl.bin > u-boot-sunxi-with-spl-pinetab.bin
-}   
+}
 
 package() {
   cd u-boot-${pkgver/rc/-rc}
   mkdir -p "${pkgdir}"/boot/extlinux
-  cp u-boot-sunxi-with-spl-pinetab.bin "${pkgdir}"/boot
+  
+  install -D -m 0644 u-boot-sunxi-with-spl-pinetab.bin -t "${pkgdir}"/boot
  }

pinetab_defconfig

+CONFIG_ARM=y
+CONFIG_ARCH_SUNXI=y
+CONFIG_SPL=y
+CONFIG_MACH_SUN50I=y
+CONFIG_SUNXI_DRAM_LPDDR3_STOCK=y
+CONFIG_DRAM_CLK=552
+CONFIG_DRAM_ZQ=3881949
+CONFIG_MMC_SUNXI_SLOT_EXTRA=2
+CONFIG_R_I2C_ENABLE=y
+CONFIG_SPL_SPI_SUNXI=y
+# CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
+CONFIG_USE_PREBOOT=y
+# CONFIG_SPL_DOS_PARTITION is not set
+# CONFIG_SPL_EFI_PARTITION is not set
+CONFIG_DEFAULT_DEVICE_TREE="sun50i-a64-pinetab"
+CONFIG_OF_LIST="sun50i-a64-pinetab"
+CONFIG_SYS_RELOC_GD_ENV_ADDR=y
+CONFIG_DM_REGULATOR=y
+CONFIG_DM_REGULATOR_FIXED=y
+CONFIG_DM_PWM=y
+CONFIG_PWM_SUNXI=y
+CONFIG_LED=y
+CONFIG_LED_GPIO=y
+CONFIG_USB_EHCI_HCD=y
+CONFIG_USB_OHCI_HCD=y
+CONFIG_SYS_USB_EVENT_POLL_VIA_INT_QUEUE=y

uboot-pinetab.install

@@ -9,7 +9,7 @@ create_config() {
   echo "LABEL Manjaro ARM
 KERNEL /Image
 FDT /dtbs/allwinner/sun50i-a64-pinetab-early-adopter.dtb
-APPEND initrd=/initramfs-linux.img console=ttyS0,115200 root=LABEL=ROOT_MNJRO rw rootwait quiet splash plymouth.ignore-serial-consoles" > /boot/extlinux/extlinux.conf
+APPEND initrd=/initramfs-linux.img console=ttyS0,115200 root=LABEL=ROOT_MNJRO rw rootwait audit=0 splash plymouth.ignore-serial-consoles" > /boot/extlinux/extlinux.conf
 }
 
 post_install() {