remove unneeded stuff, apply forgotten stuff

config/bootscripts/boot-mt7623.cmd

@@ -5,7 +5,7 @@
 setenv root "/dev/mmcblk1p1"
 setenv rootfs "ext4"
 setenv verbosity "1"
-setenv bootargs initcall_debug console=ttyS2,115200n1 root=${root} rw rootfstype=${rootfs} rootwait audit=0 loglevel=${verbosity}
+setenv bootargs "initcall_debug console=ttyS2,115200n1 root=${root} rw rootfstype=${rootfs} rootwait audit=0 loglevel=${verbosity}"
 ext4load mmc ${mmcnum}:${mmcpart} ${fdtaddr} ${mmcfdtfile}
 ext4load mmc ${mmcnum}:${mmcpart} ${rdaddr} ${mmcinitrdfile}
 ext4load mmc ${mmcnum}:${mmcpart} ${kernel_addr_r} ${mmckernfile}

patch/kernel/mt7623-next/general-packaging-4.17-dev.patch → patch/kernel/mt7623-next/general-packaging-4.18-DEV.patch

@@ -5,7 +5,7 @@ index 90c9a8a..3c79b90 100755
 @@ -29,6 +29,27 @@ create_package() {
  	# in case we are in a restrictive umask environment like 0077
  	chmod -R a+rX "$pdir"
- 
+
 +	# Create preinstall and post install script to remove dtb
 +	if [[ "$1" == *dtb* ]]; then
 +		echo "if [ -d /boot/dtb-$version ]; then mv /boot/dtb-$version /boot/dtb-$version.old; fi" >> $pdir/DEBIAN/preinst
@@ -43,14 +43,14 @@ index 90c9a8a..3c79b90 100755
 +dtb_packagename=linux-dtb-dev"$LOCALVERSION"
 +libc_headers_packagename=linux-libc-dev-dev"$LOCALVERSION"
  dbg_packagename=$packagename-dbg
- 
+
  if [ "$ARCH" = "um" ] ; then
 @@ -52,6 +75,15 @@ fi
  # XXX: have each arch Makefile export a variable of the canonical image install
  # path instead
  case $ARCH in
 +aarch64|arm64)
-+	image_name=Image
++	image_name=zImage
 +	installed_image_path="boot/vmlinuz-$version"
 +
 +	;;
@@ -63,7 +63,7 @@ index 90c9a8a..3c79b90 100755
  	;;
 @@ -65,7 +97,9 @@ esac
  BUILD_DEBUG="$(grep -s '^CONFIG_DEBUG_INFO=y' $KCONFIG_CONFIG || true)"
- 
+
  # Setup the directory structure
 -rm -rf "$tmpdir" "$kernel_headers_dir" "$libc_headers_dir" "$dbg_dir" $objtree/debian/files
 +rm -rf "$tmpdir" "$kernel_headers_dir" "$libc_headers_dir" "$dbg_dir" "$dtb_dir" $objtree/debian/files
@@ -75,7 +75,7 @@ index 90c9a8a..3c79b90 100755
 @@ -118,6 +152,11 @@ if grep -q '^CONFIG_MODULES=y' $KCONFIG_CONFIG ; then
  	fi
  fi
- 
+
 +if grep -q '^CONFIG_OF=y' $KCONFIG_CONFIG ; then
 +	#mkdir -p "$tmpdir/boot/dtb"
 +	INSTALL_DTBS_PATH="$dtb_dir/boot/dtb-$version" $MAKE KBUILD_SRC= dtbs_install
@@ -90,25 +90,25 @@ index 90c9a8a..3c79b90 100755
  	cat <<EOF > "$tmpdir/DEBIAN/$script"
 -#!/bin/sh
 +#!/bin/bash
- 
+
  set -e
- 
+
 @@ -153,9 +192,60 @@ EOF
  	chmod 755 "$tmpdir/DEBIAN/$script"
  done
- 
+
 +##
 +## Create sym link to kernel image
 +##
 +sed -e "s/set -e//g" -i $tmpdir/DEBIAN/postinst
 +sed -e "s/exit 0//g" -i $tmpdir/DEBIAN/postinst
 +cat >> $tmpdir/DEBIAN/postinst <<EOT
 +if [ "\$(grep nand /proc/partitions)" != "" ] && [ "\$(grep mmc /proc/partitions)" = "" ]; then
-+	mkimage -A arm -O linux -T kernel -C none -a "0x40008000" -e "0x40008000" -n "Linux kernel" -d /$installed_image_path /boot/uImage  > /dev/null 2>&1
-+	cp /boot/uImage /tmp/uImage
++	mkimage -A arm -O linux -T kernel -C none -a "0x40008000" -e "0x40008000" -n "Linux kernel" -d /$installed_image_path /boot/zImage  > /dev/null 2>&1
++	cp /boot/zImage /tmp/zImage
 +	sync
 +	mountpoint -q /boot || mount /boot
-+	cp /tmp/uImage /boot/uImage
++	cp /tmp/uImage /boot/zImage
 +	rm -f /$installed_image_path
 +else
 +	ln -sf $(basename $installed_image_path) /boot/$image_name || mv /$installed_image_path /boot/$image_name
@@ -164,7 +164,7 @@ index 90c9a8a..3c79b90 100755
  (cd $objtree; cp $KCONFIG_CONFIG $destdir/.config) # copy .config manually to be where it's expected to be
  ln -sf "/usr/src/linux-headers-$version" "$kernel_headers_dir/lib/modules/$version/build"
  rm -f "$objtree/debian/hdrsrcfiles" "$objtree/debian/hdrobjfiles"
- 
+
 +(cd $destdir; make M=scripts clean)
 +
  if [ "$ARCH" != "um" ]; then
@@ -173,7 +173,7 @@ index 90c9a8a..3c79b90 100755
 +	# create_package "$libc_headers_packagename" "$libc_headers_dir"
 +	create_package "$dtb_packagename" "$dtb_dir"
  fi
- 
+
  create_package "$packagename" "$tmpdir"
 diff --git a/scripts/package/mkdebian b/scripts/package/mkdebian
 index 6adb3a1..00e12eb 100755
@@ -192,7 +192,7 @@ index 6adb3a1..00e12eb 100755
  debarch=
 +image_name=
  set_debarch
- 
+
  if [ "$ARCH" = "um" ] ; then
 @@ -168,6 +170,11 @@ Architecture: $debarch
  Description: Linux kernel debugging symbols for $version
@@ -204,19 +204,18 @@ index 6adb3a1..00e12eb 100755
 +Description: Linux DTB, version $version
 + This package contains device blobs from the Linux kernel, version $version
  EOF
- 
+
  cat <<EOF > debian/rules
 diff --git a/arch/arm64/Makefile b/arch/arm64/Makefile
 index f839ecd9..cd276162 100644
 --- a/arch/arm64/Makefile
 +++ b/arch/arm64/Makefile
 @@ -103,7 +103,7 @@ core-$(CONFIG_EFI_STUB) += $(objtree)/drivers/firmware/efi/libstub/lib.a
- 
+
  # Default target when executing plain make
  boot		:= arch/arm64/boot
 -KBUILD_IMAGE	:= $(boot)/Image.gz
 +KBUILD_IMAGE	:= $(boot)/Image
  KBUILD_DTBS	:= dtbs
- 
+
  all:	Image.gz $(KBUILD_DTBS)
-

patch/u-boot/u-boot-mt7623/ugly_bootpatch.patch

@@ -0,0 +1,67 @@
+diff --git a/include/configs/mt7623.h b/include/configs/mt7623.h
+index 00bad8bb..c01e4cbc 100644
+--- a/include/configs/mt7623.h
++++ b/include/configs/mt7623.h
+@@ -41,7 +41,7 @@
+ 					 GENERATED_GBL_DATA_SIZE)
+
+ /* UBoot -> Kernel */
+-#define CONFIG_LOADADDR			0x84000000
++#define CONFIG_LOADADDR			0x82000000
+ #define CONFIG_SYS_LOAD_ADDR		CONFIG_LOADADDR
+
+ /* Serial device */
+@@ -56,11 +56,50 @@
+ /* DRAM */
+ #define CONFIG_SYS_SDRAM_BASE		0x80000000
+
+-/* This is neede for kernel booting */
+-#define FDT_HIGH			"fdt_high=0xac000000\0"
++#define SCRIPT_BOOT \
++	"fileload=${mmctype}load mmc ${mmcnum}:${mmcpart} " \
++		"${loadaddr} ${mmcfile}\0" \
++	"kernload=setenv loadaddr ${kernel_addr_r};" \
++		"setenv mmcfile ${mmckernfile};" \
++		"run fileload\0" \
++	"initrdload=setenv loadaddr ${rdaddr};" \
++		"setenv mmcfile ${mmcinitrdfile};" \
++		"run fileload\0" \
++	"fdtload=setenv loadaddr ${fdtaddr};" \
++		"setenv mmcfile ${mmcfdtfile};" \
++		"run fileload\0" \
++	"scriptload=setenv loadaddr ${scriptaddr};" \
++		"setenv mmcfile ${mmcscriptfile};" \
++		"run fileload\0" \
++	"scriptboot=echo Running ${mmcscriptfile} from: mmc ${mmcnum}:${mmcpart} using ${mmcscriptfile};" \
++		"source ${scriptaddr};" \
+
+ /* Extra environment variables */
+ #define CONFIG_EXTRA_ENV_SETTINGS	\
+-	FDT_HIGH
++	"loadaddr=0x82000000\0" \
++	"kernel_addr_r=0x82000000\0" \
++	"scriptaddr=0x85F80000\0" \
++	"fdtaddr=0x86000000\0" \
++	"fdt_addr_r=0x86000000\0" \
++	"rdaddr=0x86080000\0" \
++	"ramdisk_addr_r=0x86080000\0" \
++	"bootm_size=0x10000000\0" \
++	"mmckernfile=boot/zImage\0" \
++	"mmcinitrdfile= boot/uInitrd\0" \
++	"mmcfdtfile=boot/dtb/mt7623n-bananapi-bpi-r2.dtb\0" \
++	"mmcscriptfile=boot/boot.scr\0" \
++	"mmctype=ext4\0" \
++	"mmcnum=1\0" \
++	"mmcpart=1\0" \
++	SCRIPT_BOOT
++
++#define CONFIG_BOOTCOMMAND \
++	"mmc dev 1;" \
++	"run scriptload;" \
++	"run scriptboot;" \
++	"setenv mmcnum 0;" \
++	"mmc dev 0;" \
++	"run scriptload;" \
++	"run scriptboot"
+
+ #endif