Attachment #209265 for bug #241795

Lines 16-22 NODOC=1 Link Here

(-)b/release/arm/RPI-B.conf (-3 / +3 lines)
16	UBOOT_DIR="/usr/local/share/u-boot/u-boot-rpi"	16	UBOOT_DIR="/usr/local/share/u-boot/u-boot-rpi"
17	RPI_FIRMWARE_DIR="/usr/local/share/rpi-firmware"	17	RPI_FIRMWARE_DIR="/usr/local/share/rpi-firmware"
18	OL_DIR="${RPI_FIRMWARE_DIR}/overlays"	18	OL_DIR="${RPI_FIRMWARE_DIR}/overlays"
19	OVERLAYS="mmc.dtbo pi3-disable-bt.dtbo"	19	OVERLAYS="mmc.dtbo disable-bt.dtbo"
20	PART_SCHEME="MBR"	20	PART_SCHEME="MBR"
21	export BOARDNAME="RPI-B"	21	export BOARDNAME="RPI-B"
22		22
Lines 25-32 arm_install_uboot() { Link Here
25	RPI_FIRMWARE_FILES="bootcode.bin config.txt \	25	RPI_FIRMWARE_FILES="bootcode.bin config.txt \
26	fixup.dat fixup_cd.dat fixup_db.dat fixup_x.dat \	26	fixup.dat fixup_cd.dat fixup_db.dat fixup_x.dat \
27	start.elf start_cd.elf start_db.elf start_x.elf \	27	start.elf start_cd.elf start_db.elf start_x.elf \
28	bcm2708-rpi-0-w.dtb bcm2708-rpi-b-plus.dtb bcm2708-rpi-b.dtb \	28	bcm2708-rpi-zero-w.dtb bcm2708-rpi-b-plus.dtb \
29	bcm2708-rpi-cm.dtb"	29	bcm2708-rpi-b.dtb bcm2708-rpi-cm.dtb"
30	FATMOUNT="${DESTDIR%${KERNEL}}/fat"	30	FATMOUNT="${DESTDIR%${KERNEL}}/fat"
31	chroot ${CHROOTDIR} mkdir -p "${FATMOUNT}"	31	chroot ${CHROOTDIR} mkdir -p "${FATMOUNT}"
32	chroot ${CHROOTDIR} mount_msdosfs /dev/${mddev}s1 ${FATMOUNT}	32	chroot ${CHROOTDIR} mount_msdosfs /dev/${mddev}s1 ${FATMOUNT}




#

DTB_DIR="/usr/local/share/rpi-firmware"
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

MD_ARGS="-x 63 -y 255"
NODOC=1
OL_DIR="${DTB_DIR}/overlays"
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 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"

		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

Return to bug 241795

Lines 4-10 Link Here

(-)b/release/arm64/RPI3.conf (-3 / +5 lines)
4	#	4	#
5		5
6	DTB_DIR="/usr/local/share/rpi-firmware"	6	DTB_DIR="/usr/local/share/rpi-firmware"
7	DTB="bcm2710-rpi-3-b.dtb bcm2710-rpi-3-b-plus.dtb"	7	DTB="bcm2710-rpi-3-b.dtb bcm2710-rpi-3-b-plus.dtb bcm2711-rpi-4-b.dtb"
8	EMBEDDED_TARGET_ARCH="aarch64"	8	EMBEDDED_TARGET_ARCH="aarch64"
9	EMBEDDED_TARGET="arm64"	9	EMBEDDED_TARGET="arm64"
10	EMBEDDEDBUILD=1	10	EMBEDDEDBUILD=1
Lines 16-29 KERNEL="GENERIC" Link Here
16	MD_ARGS="-x 63 -y 255"	16	MD_ARGS="-x 63 -y 255"
17	NODOC=1	17	NODOC=1
18	OL_DIR="${DTB_DIR}/overlays"	18	OL_DIR="${DTB_DIR}/overlays"
19	OVERLAYS="mmc.dtbo pwm.dtbo pi3-disable-bt.dtbo"	19	OVERLAYS="mmc.dtbo pwm.dtbo disable-bt.dtbo"
20	PART_SCHEME="MBR"	20	PART_SCHEME="MBR"
21	export BOARDNAME="RPI3"	21	export BOARDNAME="RPI3"
22		22
23	arm_install_uboot() {	23	arm_install_uboot() {
24	UBOOT_DIR="/usr/local/share/u-boot/u-boot-rpi3"	24	UBOOT_DIR="/usr/local/share/u-boot/u-boot-rpi3"
25	UBOOT_FILES="README u-boot.bin"	25	UBOOT_FILES="README u-boot.bin"
26	DTB_FILES="armstub8.bin bootcode.bin fixup_cd.dat \	26	DTB_FILES="armstub8.bin armstub8-gic.bin bootcode.bin fixup_cd.dat \
27	fixup_db.dat fixup_x.dat fixup.dat LICENCE.broadcom \	27	fixup_db.dat fixup_x.dat fixup.dat LICENCE.broadcom \
28	start_cd.elf start_db.elf start_x.elf start.elf ${DTB}"	28	start_cd.elf start_db.elf start_x.elf start.elf ${DTB}"
29	FATMOUNT="${DESTDIR%${KERNEL}}fat"	29	FATMOUNT="${DESTDIR%${KERNEL}}fat"
Lines 37-42 arm_install_uboot() { Link Here
37	chroot ${CHROOTDIR} cp -p ${DTB_DIR}/${_DF} \	37	chroot ${CHROOTDIR} cp -p ${DTB_DIR}/${_DF} \
38	${FATMOUNT}/${_DF}	38	${FATMOUNT}/${_DF}
39	done	39	done
		40	chroot ${CHROOTDIR} cp -p ${DTB_DIR}/config_rpi4.txt \
		41	${FATMOUNT}
40	chroot ${CHROOTDIR} cp -p ${DTB_DIR}/config_rpi3.txt \	42	chroot ${CHROOTDIR} cp -p ${DTB_DIR}/config_rpi3.txt \
41	${FATMOUNT}/config.txt	43	${FATMOUNT}/config.txt
42	chroot ${CHROOTDIR} mkdir -p ${FATMOUNT}/overlays	44	chroot ${CHROOTDIR} mkdir -p ${FATMOUNT}/overlays