aboutsummaryrefslogtreecommitdiff
path: root/sys/boot
diff options
context:
space:
mode:
Diffstat (limited to 'sys/boot')
-rw-r--r--sys/boot/efi/boot1/Makefile10
-rw-r--r--sys/boot/efi/boot1/boot1.c2
-rw-r--r--sys/boot/efi/fdt/Makefile2
-rw-r--r--sys/boot/efi/loader/Makefile10
-rw-r--r--sys/boot/fdt/dts/arm/bananapi.dts15
-rw-r--r--sys/boot/fdt/dts/arm/db78460.dts2
-rw-r--r--sys/boot/ficl/Makefile2
-rw-r--r--sys/boot/i386/gptboot/Makefile2
-rw-r--r--sys/boot/i386/gptzfsboot/Makefile2
-rw-r--r--sys/boot/i386/libfirewire/Makefile2
-rw-r--r--sys/boot/i386/libi386/Makefile2
-rw-r--r--sys/boot/i386/loader/Makefile2
-rw-r--r--sys/boot/i386/zfsboot/Makefile2
-rw-r--r--sys/boot/libstand32/Makefile2
-rw-r--r--sys/boot/ofw/libofw/Makefile2
-rw-r--r--sys/boot/uboot/fdt/Makefile2
-rw-r--r--sys/boot/uboot/lib/Makefile2
-rw-r--r--sys/boot/userboot/ficl/Makefile2
-rw-r--r--sys/boot/zfs/Makefile2
19 files changed, 41 insertions, 26 deletions
diff --git a/sys/boot/efi/boot1/Makefile b/sys/boot/efi/boot1/Makefile
index c4c92cba8932..0c2394524b09 100644
--- a/sys/boot/efi/boot1/Makefile
+++ b/sys/boot/efi/boot1/Makefile
@@ -73,8 +73,8 @@ LDADD+= -lstand
DPADD+= ${LDSCRIPT}
+NM?= nm
OBJCOPY?= objcopy
-OBJDUMP?= objdump
.if ${MACHINE_CPUARCH} == "amd64"
EFI_TARGET= efi-app-x86_64
@@ -85,8 +85,8 @@ EFI_TARGET= binary
.endif
boot1.efi: ${PROG}
- if [ `${OBJDUMP} -t ${.ALLSRC} | fgrep '*UND*' | wc -l` != 0 ]; then \
- ${OBJDUMP} -t ${.ALLSRC} | fgrep '*UND*'; \
+ if ${NM} ${.ALLSRC} | grep ' U '; then \
+ echo "Undefined symbols in ${.ALLSRC}"; \
exit 1; \
fi
${OBJCOPY} -j .peheader -j .text -j .sdata -j .data \
@@ -124,13 +124,13 @@ beforedepend ${OBJS}: machine
CLEANFILES+= machine
-machine:
+machine: .NOMETA
ln -sf ${.CURDIR}/../../../${MACHINE}/include machine
.if ${MACHINE_CPUARCH} == "amd64" || ${MACHINE_CPUARCH} == "i386"
beforedepend ${OBJS}: x86
CLEANFILES+= x86
-x86:
+x86: .NOMETA
ln -sf ${.CURDIR}/../../../x86/include x86
.endif
diff --git a/sys/boot/efi/boot1/boot1.c b/sys/boot/efi/boot1/boot1.c
index 1161b0a1e58a..1b84d4189e10 100644
--- a/sys/boot/efi/boot1/boot1.c
+++ b/sys/boot/efi/boot1/boot1.c
@@ -405,7 +405,7 @@ try_boot()
if ((status = bs->LoadImage(TRUE, image, devpath_last(dev->devpath),
loaderbuf, loadersize, &loaderhandle)) != EFI_SUCCESS) {
printf("Failed to load image provided by %s, size: %zu, (%lu)\n",
- mod->name, bufsize, EFI_ERROR_CODE(status));
+ mod->name, loadersize, EFI_ERROR_CODE(status));
goto errout;
}
diff --git a/sys/boot/efi/fdt/Makefile b/sys/boot/efi/fdt/Makefile
index 15862dc2957e..65f6e6336bab 100644
--- a/sys/boot/efi/fdt/Makefile
+++ b/sys/boot/efi/fdt/Makefile
@@ -27,7 +27,7 @@ CFLAGS+= -I${.CURDIR}/../../fdt
# Pick up the bootstrap header for some interface items
CFLAGS+= -I${.CURDIR}/../../common -I${.CURDIR}/../../.. -I.
-machine:
+machine: .NOMETA
ln -sf ${.CURDIR}/../../../${MACHINE}/include machine
CLEANFILES+= machine
diff --git a/sys/boot/efi/loader/Makefile b/sys/boot/efi/loader/Makefile
index d36e54bc077d..f4f6cbf6a44d 100644
--- a/sys/boot/efi/loader/Makefile
+++ b/sys/boot/efi/loader/Makefile
@@ -98,8 +98,8 @@ NEWVERSWHAT= "EFI loader" ${MACHINE}
vers.c: ${.CURDIR}/../../common/newvers.sh ${.CURDIR}/../../efi/loader/version
sh ${.CURDIR}/../../common/newvers.sh ${.CURDIR}/version ${NEWVERSWHAT}
+NM?= nm
OBJCOPY?= objcopy
-OBJDUMP?= objdump
.if ${MACHINE_CPUARCH} == "amd64"
EFI_TARGET= efi-app-x86_64
@@ -110,8 +110,8 @@ EFI_TARGET= binary
.endif
loader.efi: ${PROG}
- if [ `${OBJDUMP} -t ${.ALLSRC} | fgrep '*UND*' | wc -l` != 0 ]; then \
- ${OBJDUMP} -t ${.ALLSRC} | fgrep '*UND*'; \
+ if ${NM} ${.ALLSRC} | grep ' U '; then \
+ echo "Undefined symbols in ${.ALLSRC}"; \
exit 1; \
fi
${OBJCOPY} -j .peheader -j .text -j .sdata -j .data \
@@ -131,13 +131,13 @@ beforedepend ${OBJS}: machine
CLEANFILES+= machine
-machine:
+machine: .NOMETA
ln -sf ${.CURDIR}/../../../${MACHINE}/include machine
.if ${MACHINE_CPUARCH} == "amd64" || ${MACHINE_CPUARCH} == "i386"
beforedepend ${OBJS}: x86
CLEANFILES+= x86
-x86:
+x86: .NOMETA
ln -sf ${.CURDIR}/../../../x86/include x86
.endif
diff --git a/sys/boot/fdt/dts/arm/bananapi.dts b/sys/boot/fdt/dts/arm/bananapi.dts
index 0bd1b3839477..a1017203c811 100644
--- a/sys/boot/fdt/dts/arm/bananapi.dts
+++ b/sys/boot/fdt/dts/arm/bananapi.dts
@@ -74,6 +74,21 @@
ahci: sata@01c18000 {
status = "okay";
};
+
+ hdmi: hdmi@01c16000 {
+ compatible = "allwinner,sun7i-a20-hdmi";
+ reg = <0x01c16000 0x1000>;
+ };
+
+ hdmiaudio {
+ compatible = "allwinner,sun7i-a20-hdmiaudio";
+ };
+
+ fb: fb@01e60000 {
+ compatible = "allwinner,sun7i-a20-fb";
+ reg = <0x01e60000 0x10000>, /* DEBE0 */
+ <0x01c0c000 0x1000>; /* LCD0 */
+ };
};
leds {
diff --git a/sys/boot/fdt/dts/arm/db78460.dts b/sys/boot/fdt/dts/arm/db78460.dts
index 8bc04f8dfa3e..9b4d08fddd15 100644
--- a/sys/boot/fdt/dts/arm/db78460.dts
+++ b/sys/boot/fdt/dts/arm/db78460.dts
@@ -75,7 +75,7 @@
interrupt-controller;
#address-cells = <0>;
#interrupt-cells = <1>;
- reg = <0x20a00 0x500 0x21000 0x800 0x20400 0x100>;
+ reg = <0x20a00 0x500 0x21870 0x58 0x20400 0x100>;
compatible = "mrvl,mpic";
};
diff --git a/sys/boot/ficl/Makefile b/sys/boot/ficl/Makefile
index 0451aa9835cc..bce9ffa78870 100644
--- a/sys/boot/ficl/Makefile
+++ b/sys/boot/ficl/Makefile
@@ -75,7 +75,7 @@ ${SRCS:M*.c:R:S/$/.o/g}: machine
beforedepend ${OBJS}: machine
.endif
-machine:
+machine: .NOMETA
ln -sf ${.CURDIR}/../../i386/include machine
CLEANFILES+= machine
diff --git a/sys/boot/i386/gptboot/Makefile b/sys/boot/i386/gptboot/Makefile
index 71814c14e1d7..1aafe0bfb13b 100644
--- a/sys/boot/i386/gptboot/Makefile
+++ b/sys/boot/i386/gptboot/Makefile
@@ -74,7 +74,7 @@ gptboot.o: ${.CURDIR}/../../common/ufsread.c
.if ${MACHINE_CPUARCH} == "amd64"
beforedepend gptboot.o: machine
CLEANFILES+= machine
-machine:
+machine: .NOMETA
ln -sf ${.CURDIR}/../../../i386/include machine
.endif
diff --git a/sys/boot/i386/gptzfsboot/Makefile b/sys/boot/i386/gptzfsboot/Makefile
index 91a637f12755..140633320b5c 100644
--- a/sys/boot/i386/gptzfsboot/Makefile
+++ b/sys/boot/i386/gptzfsboot/Makefile
@@ -72,7 +72,7 @@ zfsboot.o: ${.CURDIR}/../../zfs/zfsimpl.c
.if ${MACHINE_CPUARCH} == "amd64"
beforedepend zfsboot.o: machine
CLEANFILES+= machine
-machine:
+machine: .NOMETA
ln -sf ${.CURDIR}/../../../i386/include machine
.endif
diff --git a/sys/boot/i386/libfirewire/Makefile b/sys/boot/i386/libfirewire/Makefile
index 191b95479e25..904f4abccae9 100644
--- a/sys/boot/i386/libfirewire/Makefile
+++ b/sys/boot/i386/libfirewire/Makefile
@@ -18,7 +18,7 @@ CFLAGS+= -Wformat -Wall
.if ${MACHINE_CPUARCH} == "amd64"
CLEANFILES+= machine
-machine:
+machine: .NOMETA
ln -sf ${.CURDIR}/../../../i386/include machine
.endif
diff --git a/sys/boot/i386/libi386/Makefile b/sys/boot/i386/libi386/Makefile
index 3e61a1b96868..f3c1d8d1cff3 100644
--- a/sys/boot/i386/libi386/Makefile
+++ b/sys/boot/i386/libi386/Makefile
@@ -60,7 +60,7 @@ CFLAGS+= ${FORMAT_EXTENSIONS}
.if ${MACHINE_CPUARCH} == "amd64"
CLEANFILES+= machine
-machine:
+machine: .NOMETA
ln -sf ${.CURDIR}/../../../i386/include machine
.endif
diff --git a/sys/boot/i386/loader/Makefile b/sys/boot/i386/loader/Makefile
index bcbe0b86c627..776ba92f4a27 100644
--- a/sys/boot/i386/loader/Makefile
+++ b/sys/boot/i386/loader/Makefile
@@ -125,6 +125,6 @@ LDADD= ${LIBFICL} ${LIBFIREWIRE} ${LIBZFSBOOT} ${LIBI386} ${LIBSTAND}
beforedepend ${OBJS}: machine
CLEANFILES+= machine
CFLAGS+= -DLOADER_PREFER_AMD64
-machine: .NOPATH
+machine: .NOMETA
ln -sf ${.CURDIR}/../../../i386/include machine
.endif
diff --git a/sys/boot/i386/zfsboot/Makefile b/sys/boot/i386/zfsboot/Makefile
index 5ecf13c25d5e..f65e0ad28435 100644
--- a/sys/boot/i386/zfsboot/Makefile
+++ b/sys/boot/i386/zfsboot/Makefile
@@ -85,7 +85,7 @@ SRCS= zfsboot.c
.if ${MACHINE_CPUARCH} == "amd64"
beforedepend zfsboot.o: machine
CLEANFILES+= machine
-machine:
+machine: .NOMETA
ln -sf ${.CURDIR}/../../../i386/include machine
.endif
diff --git a/sys/boot/libstand32/Makefile b/sys/boot/libstand32/Makefile
index 66798d75e44f..6dbf1f420910 100644
--- a/sys/boot/libstand32/Makefile
+++ b/sys/boot/libstand32/Makefile
@@ -23,6 +23,6 @@ CFLAGS+= -m32 -I.
.if ${MACHINE_CPUARCH} == "amd64"
CLEANFILES+= machine
beforedepend ${OBJS}: machine
-machine:
+machine: .NOMETA
ln -fs ${.CURDIR}/../../i386/include machine
.endif
diff --git a/sys/boot/ofw/libofw/Makefile b/sys/boot/ofw/libofw/Makefile
index 751ebfda75bf..3b91ea28d37a 100644
--- a/sys/boot/ofw/libofw/Makefile
+++ b/sys/boot/ofw/libofw/Makefile
@@ -25,7 +25,7 @@ SRCS+= ppc64_elf_freebsd.c
CFLAGS+= -DDISK_DEBUG
.endif
-machine:
+machine: .NOMETA
ln -sf ${.CURDIR}/../../../${MACHINE_CPUARCH}/include machine
CLEANFILES+= machine
diff --git a/sys/boot/uboot/fdt/Makefile b/sys/boot/uboot/fdt/Makefile
index 6f68665cc625..95c0800789a2 100644
--- a/sys/boot/uboot/fdt/Makefile
+++ b/sys/boot/uboot/fdt/Makefile
@@ -23,7 +23,7 @@ CFLAGS+= -I${.CURDIR}/../../fdt
# Pick up the bootstrap header for some interface items
CFLAGS+= -I${.CURDIR}/../../common -I${.CURDIR}/../../.. -I.
-machine:
+machine: .NOMETA
ln -sf ${.CURDIR}/../../../${MACHINE_CPUARCH}/include machine
CLEANFILES+= machine
diff --git a/sys/boot/uboot/lib/Makefile b/sys/boot/uboot/lib/Makefile
index b56c06021c91..982da713c66b 100644
--- a/sys/boot/uboot/lib/Makefile
+++ b/sys/boot/uboot/lib/Makefile
@@ -41,7 +41,7 @@ CFLAGS+= -I${.CURDIR}/../../common -I${.CURDIR}/../../.. -I.
CFLAGS+= -DDISK_DEBUG
.endif
-machine:
+machine: .NOMETA
ln -sf ${.CURDIR}/../../../${MACHINE_CPUARCH}/include machine
CLEANFILES+= machine
diff --git a/sys/boot/userboot/ficl/Makefile b/sys/boot/userboot/ficl/Makefile
index d8f749f9c6eb..fd6c7f07056f 100644
--- a/sys/boot/userboot/ficl/Makefile
+++ b/sys/boot/userboot/ficl/Makefile
@@ -53,7 +53,7 @@ softcore.c: ${SOFTWORDS} softcore.awk
#
#beforedepend ${OBJS}: machine
#
-#machine:
+#machine: .NOMETA
# ln -sf ${.CURDIR}/../../i386/include machine
#
#CLEANFILES+= machine
diff --git a/sys/boot/zfs/Makefile b/sys/boot/zfs/Makefile
index 6f8c26b01139..3ab2251ddbe5 100644
--- a/sys/boot/zfs/Makefile
+++ b/sys/boot/zfs/Makefile
@@ -21,7 +21,7 @@ CFLAGS+= -Wformat -Wall
.if ${MACHINE_CPUARCH} == "amd64"
CLEANFILES+= machine
-machine:
+machine: .NOMETA
ln -sf ${.CURDIR}/../../i386/include machine
.endif
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-14 19:17:55 +0000