Page MenuHomeFreeBSD
Files F142451352

D44059.id134937.diff
No OneTemporary
Actions

D44059.id134937.diff
View Options

diff --git a/stand/uboot/Makefile b/stand/uboot/Makefile
--- a/stand/uboot/Makefile
+++ b/stand/uboot/Makefile
@@ -40,7 +40,7 @@
# 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
--- a/stand/uboot/arch/arm/Makefile.inc
+++ b/stand/uboot/arch/arm/Makefile.inc
@@ -4,22 +4,22 @@
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
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
rename from stand/uboot/arch/powerpc/ldscript.powerpc
rename to stand/uboot/arch/powerpc/powerpc.ldscript

File Metadata

Mime Type
text/plain
Expires
Wed, Jan 21, 2:34 AM (20 h, 53 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
27787221
Default Alt Text
D44059.id134937.diff (1 KB)

Event Timeline