Attachment 209265 Details for Bug 241795 – git(1) diff against base

[patch] git(1) diff against base

relup.diff (text/plain), 2.29 KB, created by Kyle Evans on 2019-11-20 04:11:16 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Kyle Evans

Created: 2019-11-20 04:11:16 UTC

Size: 2.29 KB

patch

obsolete

>diff --git a/release/arm/RPI-B.conf b/release/arm/RPI-B.conf
>index ffcba19376d..27fa6aac264 100644
>--- a/release/arm/RPI-B.conf
>+++ b/release/arm/RPI-B.conf
>@@ -16,7 +16,7 @@ NODOC=1
> UBOOT_DIR="/usr/local/share/u-boot/u-boot-rpi"
> RPI_FIRMWARE_DIR="/usr/local/share/rpi-firmware"
> OL_DIR="${RPI_FIRMWARE_DIR}/overlays"
>-OVERLAYS="mmc.dtbo pi3-disable-bt.dtbo"
>+OVERLAYS="mmc.dtbo disable-bt.dtbo"
> PART_SCHEME="MBR"
> export BOARDNAME="RPI-B"
> 
>@@ -25,8 +25,8 @@ arm_install_uboot() {
> 	RPI_FIRMWARE_FILES="bootcode.bin config.txt \
> 		fixup.dat fixup_cd.dat fixup_db.dat fixup_x.dat \
> 		start.elf start_cd.elf start_db.elf start_x.elf \
>-		bcm2708-rpi-0-w.dtb bcm2708-rpi-b-plus.dtb bcm2708-rpi-b.dtb \
>-		bcm2708-rpi-cm.dtb"
>+		bcm2708-rpi-zero-w.dtb bcm2708-rpi-b-plus.dtb \
>+		bcm2708-rpi-b.dtb bcm2708-rpi-cm.dtb"
> 	FATMOUNT="${DESTDIR%${KERNEL}}/fat"
> 	chroot ${CHROOTDIR} mkdir -p "${FATMOUNT}"
> 	chroot ${CHROOTDIR} mount_msdosfs /dev/${mddev}s1 ${FATMOUNT}
>diff --git a/release/arm64/RPI3.conf b/release/arm64/RPI3.conf
>index cc00b0b71a1..0daa54d60f2 100644
>--- a/release/arm64/RPI3.conf
>+++ b/release/arm64/RPI3.conf
>@@ -4,7 +4,7 @@
> #
> 
> DTB_DIR="/usr/local/share/rpi-firmware"
>-DTB="bcm2710-rpi-3-b.dtb bcm2710-rpi-3-b-plus.dtb"
>+DTB="bcm2710-rpi-3-b.dtb bcm2710-rpi-3-b-plus.dtb bcm2711-rpi-4-b.dtb"
> EMBEDDED_TARGET_ARCH="aarch64"
> EMBEDDED_TARGET="arm64"
> EMBEDDEDBUILD=1
>@@ -16,14 +16,14 @@ KERNEL="GENERIC"
> MD_ARGS="-x 63 -y 255"
> NODOC=1
> OL_DIR="${DTB_DIR}/overlays"
>-OVERLAYS="mmc.dtbo pwm.dtbo pi3-disable-bt.dtbo"
>+OVERLAYS="mmc.dtbo pwm.dtbo disable-bt.dtbo"
> PART_SCHEME="MBR"
> export BOARDNAME="RPI3"
> 
> arm_install_uboot() {
> 	UBOOT_DIR="/usr/local/share/u-boot/u-boot-rpi3"
> 	UBOOT_FILES="README u-boot.bin"
>-	DTB_FILES="armstub8.bin bootcode.bin fixup_cd.dat \
>+	DTB_FILES="armstub8.bin armstub8-gic.bin bootcode.bin fixup_cd.dat \
> 		fixup_db.dat fixup_x.dat fixup.dat LICENCE.broadcom \
> 		start_cd.elf start_db.elf start_x.elf start.elf ${DTB}"
> 	FATMOUNT="${DESTDIR%${KERNEL}}fat"
>@@ -37,6 +37,8 @@ arm_install_uboot() {
> 		chroot ${CHROOTDIR} cp -p ${DTB_DIR}/${_DF} \
> 			${FATMOUNT}/${_DF}
> 	done
>+	chroot ${CHROOTDIR} cp -p ${DTB_DIR}/config_rpi4.txt \
>+			${FATMOUNT}
> 	chroot ${CHROOTDIR} cp -p ${DTB_DIR}/config_rpi3.txt \
> 			${FATMOUNT}/config.txt
> 	chroot ${CHROOTDIR} mkdir -p ${FATMOUNT}/overlays

Actions: View | Diff

Attachments on bug 241795: 208959 | 208971 | 209149 | 209265 | 209353