git: 3d6239d2449e - main - loader/uboot: Move to foo.ldconfig
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Sun, 25 Feb 2024 00:58:31 UTC
The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=3d6239d2449ee085a9a078c378659469fd69b135 commit 3d6239d2449ee085a9a078c378659469fd69b135 Author: Warner Losh <imp@FreeBSD.org> AuthorDate: 2024-02-25 00:56:48 +0000 Commit: Warner Losh <imp@FreeBSD.org> CommitDate: 2024-02-25 00:56:48 +0000 loader/uboot: Move to foo.ldconfig Move to the foo.ldconfig convention to match the rest of the boot loader. No functional change intended. Sponsored by: Netflix Reviewed by: tsoome, kevans Differential Revision: https://reviews.freebsd.org/D44059 --- stand/uboot/Makefile | 2 +- stand/uboot/arch/arm/Makefile.inc | 14 +++++++------- stand/uboot/arch/arm/{ldscript.arm => arm.ldscript} | 0 .../arch/powerpc/{ldscript.powerpc => powerpc.ldscript} | 0 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/stand/uboot/Makefile b/stand/uboot/Makefile index 4405f09408bf..ccd02c44957f 100644 --- a/stand/uboot/Makefile +++ b/stand/uboot/Makefile @@ -40,7 +40,7 @@ HELP_FILENAME= loader.help.uboot # Always add MI sources .include "${BOOTSRC}/loader.mk" -LDSCRIPT= ${.CURDIR}/arch/${MACHINE_CPUARCH}/ldscript.${MACHINE_CPUARCH} +LDSCRIPT= ${.CURDIR}/arch/${MACHINE_CPUARCH}/${MACHINE_CPUARCH}.ldscript LDFLAGS= -nostdlib -static -T ${LDSCRIPT} LDFLAGS+= -Wl,-znotext diff --git a/stand/uboot/arch/arm/Makefile.inc b/stand/uboot/arch/arm/Makefile.inc index 66cb3f1b4dda..115f48672b18 100644 --- a/stand/uboot/arch/arm/Makefile.inc +++ b/stand/uboot/arch/arm/Makefile.inc @@ -4,22 +4,22 @@ UBLDR_LOADADDR?= 0x1000000 SRCS+= start.S conf.c self_reloc.c -ldscript.abs: +abs.ldscript: echo "UBLDR_LOADADDR = ${UBLDR_LOADADDR};" >${.TARGET} -ldscript.pie: +pie.ldscript: echo "UBLDR_LOADADDR = 0;" >${.TARGET} -ubldr: ${OBJS} ldscript.abs ${LDSCRIPT} ${DPADD} - ${CC} ${CFLAGS} -T ldscript.abs ${LDFLAGS} \ +ubldr: ${OBJS} abs.ldscript ${LDSCRIPT} ${DPADD} + ${CC} ${CFLAGS} -T abs.ldscript ${LDFLAGS} \ -o ${.TARGET} ${OBJS} ${LDADD} -ubldr.pie: ${OBJS} ldscript.pie ${LDSCRIPT} ${DPADD} - ${CC} ${CFLAGS} -T ldscript.pie ${LDFLAGS} -pie -Wl,-Bsymbolic \ +ubldr.pie: ${OBJS} pie.ldscript ${LDSCRIPT} ${DPADD} + ${CC} ${CFLAGS} -T pie.ldscript ${LDFLAGS} -pie -Wl,-Bsymbolic \ -o ${.TARGET} ${OBJS} ${LDADD} ubldr.bin: ubldr.pie ${OBJCOPY} -S -O binary ubldr.pie ${.TARGET} -CLEANFILES+= ldscript.abs ldscript.pie ubldr ubldr.pie ubldr.bin +CLEANFILES+= abs.ldscript pie.ldscript ubldr ubldr.pie ubldr.bin diff --git a/stand/uboot/arch/arm/ldscript.arm b/stand/uboot/arch/arm/arm.ldscript similarity index 100% rename from stand/uboot/arch/arm/ldscript.arm rename to stand/uboot/arch/arm/arm.ldscript diff --git a/stand/uboot/arch/powerpc/ldscript.powerpc b/stand/uboot/arch/powerpc/powerpc.ldscript similarity index 100% rename from stand/uboot/arch/powerpc/ldscript.powerpc rename to stand/uboot/arch/powerpc/powerpc.ldscript