CVS commit: src/sys/arch/evbarm/stand/gzboot
Module Name:src
Committed By: thorpej
Date: Wed Feb 12 19:55:32 UTC 2020
Modified Files:
src/sys/arch/evbarm/stand/gzboot: Makefile.gzboot gzboot.c
Log Message:
Allow a configuration to specify an arbitrary address where the
compressed kernel image is located, in the event it can't be appended
to or embedded within the gzboot binary itself.
To generate a diff of this commit:
cvs rdiff -u -r1.37 -r1.38 src/sys/arch/evbarm/stand/gzboot/Makefile.gzboot
cvs rdiff -u -r1.15 -r1.16 src/sys/arch/evbarm/stand/gzboot/gzboot.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/evbarm/stand/gzboot/Makefile.gzboot
diff -u src/sys/arch/evbarm/stand/gzboot/Makefile.gzboot:1.37 src/sys/arch/evbarm/stand/gzboot/Makefile.gzboot:1.38
--- src/sys/arch/evbarm/stand/gzboot/Makefile.gzboot:1.37 Thu Oct 24 18:46:21 2019
+++ src/sys/arch/evbarm/stand/gzboot/Makefile.gzboot Wed Feb 12 19:55:32 2020
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.gzboot,v 1.37 2019/10/24 18:46:21 christos Exp $
+# $NetBSD: Makefile.gzboot,v 1.38 2020/02/12 19:55:32 thorpej Exp $
NOMAN= # defined
@@ -49,6 +49,9 @@ CPPFLAGS+= -DHEAP_VARIABLE
CPPFLAGS+= -DRELOC=${RELOC}
CPPFLAGS+= -DMAXIMAGESIZE=${MAXIMAGESIZE}
CPPFLAGS+= -DLOADADDR=${LOADADDR}
+.if defined(GZSRCADDR)
+CPPFLAGS+= -DGZSRCADDR=${GZSRCADDR}
+.endif
COPTS+= -ffreestanding
COPTS+= -fno-stack-protector
Index: src/sys/arch/evbarm/stand/gzboot/gzboot.c
diff -u src/sys/arch/evbarm/stand/gzboot/gzboot.c:1.15 src/sys/arch/evbarm/stand/gzboot/gzboot.c:1.16
--- src/sys/arch/evbarm/stand/gzboot/gzboot.c:1.15 Sat Jan 22 19:19:17 2011
+++ src/sys/arch/evbarm/stand/gzboot/gzboot.c Wed Feb 12 19:55:32 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: gzboot.c,v 1.15 2011/01/22 19:19:17 joerg Exp $ */
+/* $NetBSD: gzboot.c,v 1.16 2020/02/12 19:55:32 thorpej Exp $ */
/*
* Copyright (c) 2002 Wasabi Systems, Inc.
@@ -111,6 +111,12 @@ void zmemcpy(unsigned char *, unsigned c
void main(void);
void gzcopy(void *, const void *, size_t);
+#ifdef GZSRCADDR
+#define compressed_image (void *)GZSRCADDR
+#else
+#define compressed_image md_root_image
+#endif
+
void
main(void)
{
@@ -131,11 +137,14 @@ main(void)
* decompressing from an image which was concatenated onto
* the end of the gzboot binary.
*/
+#ifdef GZSRCADDR
+ printf(">> Image address: %p\n", compressed_image);
+#endif
if (md_root_size != 0)
printf(">> Image size: %u\n", md_root_size);
printf("Uncompressing image...");
- gzcopy((void *) loadaddr, md_root_image, md_root_size);
+ gzcopy((void *) loadaddr, compressed_image, md_root_size);
printf("done.\n");
printf("Jumping to image @ 0x%x...\n", md_root_loadaddr);
CVS commit: src/sys/arch/evbarm/stand/gzboot/NSLU2_dram_0x01d00000
Module Name:src
Committed By: thorpej
Date: Wed Feb 12 18:11:30 UTC 2020
Modified Files:
src/sys/arch/evbarm/stand/gzboot/NSLU2_dram_0x01d0: ldscript
Log Message:
Because everything goes into the same memory region at run-time in this
configuration *and* image data concatenated onto the end, the BSS segment
needs to be allocated in the file.
To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 \
src/sys/arch/evbarm/stand/gzboot/NSLU2_dram_0x01d0/ldscript
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/evbarm/stand/gzboot/NSLU2_dram_0x01d0/ldscript
diff -u src/sys/arch/evbarm/stand/gzboot/NSLU2_dram_0x01d0/ldscript:1.1 src/sys/arch/evbarm/stand/gzboot/NSLU2_dram_0x01d0/ldscript:1.2
--- src/sys/arch/evbarm/stand/gzboot/NSLU2_dram_0x01d0/ldscript:1.1 Wed Feb 12 06:57:35 2020
+++ src/sys/arch/evbarm/stand/gzboot/NSLU2_dram_0x01d0/ldscript Wed Feb 12 18:11:30 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: ldscript,v 1.1 2020/02/12 06:57:35 thorpej Exp $ */
+/* $NetBSD: ldscript,v 1.2 2020/02/12 18:11:30 thorpej Exp $ */
OUTPUT_FORMAT("elf32-bigarm", "elf32-bigarm",
"elf32-littlearm")
@@ -55,7 +55,7 @@ SECTIONS
__bss_start = .;
__bss_start__ = .;
.sbss :
- AT (ADDR(.sbss))
+ AT (LOADADDR(.sdata) + SIZEOF(.sdata))
{
PROVIDE (__sbss_start = .);
PROVIDE (___sbss_start = .);
@@ -67,7 +67,7 @@ SECTIONS
PROVIDE (___sbss_end = .);
} > sdram
.bss :
- AT (ADDR(.bss))
+ AT (LOADADDR(.sbss) + SIZEOF(.sbss))
{
*(.dynbss)
*(.bss)
@@ -82,9 +82,9 @@ SECTIONS
_end = .;
_bss_end__ = . ; __bss_end__ = . ; __end__ = . ;
PROVIDE (end = .);
- .image (SDRAM + SIZEOF(.text) + SIZEOF(.data) + SIZEOF(.sdata)) :
- AT (LOADADDR(.sdata) + SIZEOF(.sdata))
+ .image :
+ AT (LOADADDR(.bss) + SIZEOF(.bss))
{
*(.image)
- }
+ } > sdram
}
CVS commit: src/sys/arch/evbarm/stand/gzboot
Module Name:src
Committed By: joerg
Date: Tue Mar 1 16:08:23 UTC 2016
Modified Files:
src/sys/arch/evbarm/stand/gzboot: Makefile.gzboot
Log Message:
Don't reuse LDFLAGS for arguments passed directly to ${LD}, share/mk
expects it to be passed to ${CC} or ${CXX}, so they will generally
prefix flags with -Wl.
To generate a diff of this commit:
cvs rdiff -u -r1.33 -r1.34 src/sys/arch/evbarm/stand/gzboot/Makefile.gzboot
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/evbarm/stand/gzboot/Makefile.gzboot
diff -u src/sys/arch/evbarm/stand/gzboot/Makefile.gzboot:1.33 src/sys/arch/evbarm/stand/gzboot/Makefile.gzboot:1.34
--- src/sys/arch/evbarm/stand/gzboot/Makefile.gzboot:1.33 Sun Jan 31 15:29:04 2016
+++ src/sys/arch/evbarm/stand/gzboot/Makefile.gzboot Tue Mar 1 16:08:22 2016
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.gzboot,v 1.33 2016/01/31 15:29:04 christos Exp $
+# $NetBSD: Makefile.gzboot,v 1.34 2016/03/01 16:08:22 joerg Exp $
NOMAN= # defined
@@ -87,7 +87,7 @@ cleandir distclean: .WAIT cleanlibdir
cleanlibdir:
-rm -rf lib
-LDFLAGS= -M -T ${LDSCRIPT} --fix-v4bx
+DIRECT_LDFLAGS= -M -T ${LDSCRIPT} --fix-v4bx
LIBLIST=${LIBSA} ${LIBZ} ${LIBSA} ${LIBKERN} ${LIBSA}
@@ -114,5 +114,5 @@ FILES= ${PROGSYM}
${PROGSYM}: ${STARTFILE} ${OBJS} ${LIBSA} ${LIBZ} ${LIBKERN}
${_MKTARGET_LINK}
- ${LD} -o ${.TARGET} ${LDFLAGS} ${STARTFILE} \
+ ${LD} -o ${.TARGET} ${DIRECT_LDFLAGS} ${STARTFILE} \
${OBJS} ${LIBLIST} > ${BASE}.list
CVS commit: src/sys/arch/evbarm/stand/gzboot
Module Name:src Committed By: christos Date: Sun Jan 31 15:29:04 UTC 2016 Modified Files: src/sys/arch/evbarm/stand/gzboot: Makefile.gzboot Log Message: remove the MKPIE and MKCTF no hack, and move it to the .mk files To generate a diff of this commit: cvs rdiff -u -r1.32 -r1.33 src/sys/arch/evbarm/stand/gzboot/Makefile.gzboot Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/arch/evbarm/stand/gzboot/Makefile.gzboot diff -u src/sys/arch/evbarm/stand/gzboot/Makefile.gzboot:1.32 src/sys/arch/evbarm/stand/gzboot/Makefile.gzboot:1.33 --- src/sys/arch/evbarm/stand/gzboot/Makefile.gzboot:1.32 Sat Jan 30 21:16:28 2016 +++ src/sys/arch/evbarm/stand/gzboot/Makefile.gzboot Sun Jan 31 10:29:04 2016 @@ -1,10 +1,8 @@ -# $NetBSD: Makefile.gzboot,v 1.32 2016/01/31 02:16:28 christos Exp $ +# $NetBSD: Makefile.gzboot,v 1.33 2016/01/31 15:29:04 christos Exp $ NOMAN= # defined -.include # Pull in OBJDIR name rules. -MKPIE:=no -MKCTF:=no +.include # Pull in OBJDIR name rules. .include .include
CVS commit: src/sys/arch/evbarm/stand/gzboot
Module Name:src Committed By: christos Date: Sun Jan 31 02:16:28 UTC 2016 Modified Files: src/sys/arch/evbarm/stand/gzboot: Makefile.gzboot Log Message: Disable PIE and CTF for standalone code XXX: Must be done centrally, and there must be a better way. To generate a diff of this commit: cvs rdiff -u -r1.31 -r1.32 src/sys/arch/evbarm/stand/gzboot/Makefile.gzboot Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/arch/evbarm/stand/gzboot/Makefile.gzboot diff -u src/sys/arch/evbarm/stand/gzboot/Makefile.gzboot:1.31 src/sys/arch/evbarm/stand/gzboot/Makefile.gzboot:1.32 --- src/sys/arch/evbarm/stand/gzboot/Makefile.gzboot:1.31 Wed Jul 15 07:21:49 2015 +++ src/sys/arch/evbarm/stand/gzboot/Makefile.gzboot Sat Jan 30 21:16:28 2016 @@ -1,8 +1,10 @@ -# $NetBSD: Makefile.gzboot,v 1.31 2015/07/15 11:21:49 martin Exp $ +# $NetBSD: Makefile.gzboot,v 1.32 2016/01/31 02:16:28 christos Exp $ NOMAN= # defined .include # Pull in OBJDIR name rules. +MKPIE:=no +MKCTF:=no .include .include
CVS commit: src/sys/arch/evbarm/stand/gzboot
Module Name:src
Committed By: martin
Date: Wed Jul 15 11:21:49 UTC 2015
Modified Files:
src/sys/arch/evbarm/stand/gzboot: Makefile.gzboot
Log Message:
Clear STRIPFLAGS (stripping in general is dangerous with the -BE8 object
format, and should never be done before the final linking has happened).
>From Rin Okuyama.
To generate a diff of this commit:
cvs rdiff -u -r1.30 -r1.31 src/sys/arch/evbarm/stand/gzboot/Makefile.gzboot
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/evbarm/stand/gzboot/Makefile.gzboot
diff -u src/sys/arch/evbarm/stand/gzboot/Makefile.gzboot:1.30 src/sys/arch/evbarm/stand/gzboot/Makefile.gzboot:1.31
--- src/sys/arch/evbarm/stand/gzboot/Makefile.gzboot:1.30 Sun Jan 12 15:26:29 2014
+++ src/sys/arch/evbarm/stand/gzboot/Makefile.gzboot Wed Jul 15 11:21:49 2015
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.gzboot,v 1.30 2014/01/12 15:26:29 tsutsui Exp $
+# $NetBSD: Makefile.gzboot,v 1.31 2015/07/15 11:21:49 martin Exp $
NOMAN= # defined
@@ -26,6 +26,7 @@ LIBCRTI=
LIBC=
LIBCRTBEGIN=
LIBCRTEND=
+STRIPFLAG=
.PATH: ${EVBARM_STAND}/gzboot
.PATH: ${EVBARM_STAND}/board
CVS commit: src/sys/arch/evbarm/stand/gzboot
Module Name:src
Committed By: matt
Date: Wed Aug 21 05:55:26 UTC 2013
Modified Files:
src/sys/arch/evbarm/stand/gzboot: Makefile.gzboot
Log Message:
Use
To generate a diff of this commit:
cvs rdiff -u -r1.24 -r1.25 src/sys/arch/evbarm/stand/gzboot/Makefile.gzboot
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/evbarm/stand/gzboot/Makefile.gzboot
diff -u src/sys/arch/evbarm/stand/gzboot/Makefile.gzboot:1.24 src/sys/arch/evbarm/stand/gzboot/Makefile.gzboot:1.25
--- src/sys/arch/evbarm/stand/gzboot/Makefile.gzboot:1.24 Thu Aug 15 21:41:09 2013
+++ src/sys/arch/evbarm/stand/gzboot/Makefile.gzboot Wed Aug 21 05:55:26 2013
@@ -1,9 +1,10 @@
-# $NetBSD: Makefile.gzboot,v 1.24 2013/08/15 21:41:09 matt Exp $
+# $NetBSD: Makefile.gzboot,v 1.25 2013/08/21 05:55:26 matt Exp $
NOMAN= # defined
.include # Pull in OBJDIR name rules.
.include
+.include
EVBARM_STAND= ${S}/arch/evbarm/stand
@@ -60,20 +61,6 @@ CLEANFILES+= ${STARTFILE} vers.c ${BASE}
CLEANFILES+= ${PROGSYM}
SRCS+= vers.c
-.if !make(obj) && !make(clean) && !make(cleandir)
-.NOPATH: machine
-.endif
-
-realdepend realall: machine
-CLEANFILES+= arm machine
-
-machine::
- -rm -f arm machine
- ln -s ${S}/arch/evbarm/include machine
- ln -s ${S}/arch/arm/include arm
-
-${OBJS}: machine
-
### find out what to use for libkern
KERN_AS= library
.include "${S}/lib/libkern/Makefile.inc"
CVS commit: src/sys/arch/evbarm/stand/gzboot
Module Name:src
Committed By: matt
Date: Sun Jun 23 13:56:01 UTC 2013
Modified Files:
src/sys/arch/evbarm/stand/gzboot: Makefile.gzboot
Log Message:
Add -fno-unwind-tables
To generate a diff of this commit:
cvs rdiff -u -r1.22 -r1.23 src/sys/arch/evbarm/stand/gzboot/Makefile.gzboot
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/evbarm/stand/gzboot/Makefile.gzboot
diff -u src/sys/arch/evbarm/stand/gzboot/Makefile.gzboot:1.22 src/sys/arch/evbarm/stand/gzboot/Makefile.gzboot:1.23
--- src/sys/arch/evbarm/stand/gzboot/Makefile.gzboot:1.22 Wed Feb 6 07:19:19 2013
+++ src/sys/arch/evbarm/stand/gzboot/Makefile.gzboot Sun Jun 23 13:56:01 2013
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.gzboot,v 1.22 2013/02/06 07:19:19 matt Exp $
+# $NetBSD: Makefile.gzboot,v 1.23 2013/06/23 13:56:01 matt Exp $
NOMAN= # defined
@@ -51,6 +51,7 @@ CPPFLAGS+= -DLOADADDR=${LOADADDR}
COPTS+= -ffreestanding
COPTS+= -fno-stack-protector
+COPTS+= -fno-unwind-tables
CWARNFLAGS+= -Werror
CWARNFLAGS+= -Wall -Wmissing-prototypes -Wstrict-prototypes -Wpointer-arith
CVS commit: src/sys/arch/evbarm/stand/gzboot
Module Name:src
Committed By: matt
Date: Wed Dec 12 15:08:45 UTC 2012
Modified Files:
src/sys/arch/evbarm/stand/gzboot/ADI_BRH_flash_0x0014: Makefile
src/sys/arch/evbarm/stand/gzboot/GEMINI_dram_0x0160: Makefile
src/sys/arch/evbarm/stand/gzboot/IQ80310_flash_0x0008: Makefile
src/sys/arch/evbarm/stand/gzboot/IQ80321_flash_0xf008: Makefile
src/sys/arch/evbarm/stand/gzboot/TS7200_flash_0x6066: Makefile
Log Message:
Fix CPUFLAGS to the correct value so a passed down CPUFLAGS doesn't result
in broken images.
To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 \
src/sys/arch/evbarm/stand/gzboot/ADI_BRH_flash_0x0014/Makefile
cvs rdiff -u -r1.3 -r1.4 \
src/sys/arch/evbarm/stand/gzboot/GEMINI_dram_0x0160/Makefile
cvs rdiff -u -r1.3 -r1.4 \
src/sys/arch/evbarm/stand/gzboot/IQ80310_flash_0x0008/Makefile
cvs rdiff -u -r1.3 -r1.4 \
src/sys/arch/evbarm/stand/gzboot/IQ80321_flash_0xf008/Makefile
cvs rdiff -u -r1.2 -r1.3 \
src/sys/arch/evbarm/stand/gzboot/TS7200_flash_0x6066/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/evbarm/stand/gzboot/ADI_BRH_flash_0x0014/Makefile
diff -u src/sys/arch/evbarm/stand/gzboot/ADI_BRH_flash_0x0014/Makefile:1.2 src/sys/arch/evbarm/stand/gzboot/ADI_BRH_flash_0x0014/Makefile:1.3
--- src/sys/arch/evbarm/stand/gzboot/ADI_BRH_flash_0x0014/Makefile:1.2 Tue Apr 29 05:36:20 2003
+++ src/sys/arch/evbarm/stand/gzboot/ADI_BRH_flash_0x0014/Makefile Wed Dec 12 15:08:44 2012
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2003/04/29 05:36:20 thorpej Exp $
+# $NetBSD: Makefile,v 1.3 2012/12/12 15:08:44 matt Exp $
S= ${.CURDIR}/../../../../..
@@ -11,6 +11,7 @@ CPPFLAGS+= -DBECC_SUPPORT_V7
CPPFLAGS+= -DCONSPEED=57600
CPPFLAGS+= -DCONADDR=0x0300UL
CPPFLAGS+= -DNS16550_FREQ=3330
+CPUFLAGS= -mcpu=xscale
LDSCRIPT= ${.CURDIR}/ldscript
Index: src/sys/arch/evbarm/stand/gzboot/GEMINI_dram_0x0160/Makefile
diff -u src/sys/arch/evbarm/stand/gzboot/GEMINI_dram_0x0160/Makefile:1.3 src/sys/arch/evbarm/stand/gzboot/GEMINI_dram_0x0160/Makefile:1.4
--- src/sys/arch/evbarm/stand/gzboot/GEMINI_dram_0x0160/Makefile:1.3 Mon Aug 6 02:14:15 2012
+++ src/sys/arch/evbarm/stand/gzboot/GEMINI_dram_0x0160/Makefile Wed Dec 12 15:08:44 2012
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2012/08/06 02:14:15 matt Exp $
+# $NetBSD: Makefile,v 1.4 2012/12/12 15:08:44 matt Exp $
S= ${.CURDIR}/../../../../..
@@ -12,7 +12,7 @@ CPPFLAGS+= -DCONADDR=0x4200UL
CPPFLAGS+= -DNS16550_AX4
CPPFLAGS+= -DNS16550_FREQ=4800
-CPUFLAGS+= -march=armv4
+CPUFLAGS= -march=armv4
LDSCRIPT= ${.CURDIR}/ldscript
Index: src/sys/arch/evbarm/stand/gzboot/IQ80310_flash_0x0008/Makefile
diff -u src/sys/arch/evbarm/stand/gzboot/IQ80310_flash_0x0008/Makefile:1.3 src/sys/arch/evbarm/stand/gzboot/IQ80310_flash_0x0008/Makefile:1.4
--- src/sys/arch/evbarm/stand/gzboot/IQ80310_flash_0x0008/Makefile:1.3 Tue Apr 29 05:38:52 2003
+++ src/sys/arch/evbarm/stand/gzboot/IQ80310_flash_0x0008/Makefile Wed Dec 12 15:08:44 2012
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2003/04/29 05:38:52 thorpej Exp $
+# $NetBSD: Makefile,v 1.4 2012/12/12 15:08:44 matt Exp $
S= ${.CURDIR}/../../../../..
@@ -10,6 +10,8 @@ LOADADDR= 0xa020
CPPFLAGS+= -DCONSPEED=115200
CPPFLAGS+= -DCONADDR=0xfe81UL
+CPUFLAGS= -mcpu=xscale
+
LDSCRIPT= ${.CURDIR}/ldscript
SRCS+= iq80310.c ns16550.c i80312_mem.c
Index: src/sys/arch/evbarm/stand/gzboot/IQ80321_flash_0xf008/Makefile
diff -u src/sys/arch/evbarm/stand/gzboot/IQ80321_flash_0xf008/Makefile:1.3 src/sys/arch/evbarm/stand/gzboot/IQ80321_flash_0xf008/Makefile:1.4
--- src/sys/arch/evbarm/stand/gzboot/IQ80321_flash_0xf008/Makefile:1.3 Tue Apr 29 05:36:20 2003
+++ src/sys/arch/evbarm/stand/gzboot/IQ80321_flash_0xf008/Makefile Wed Dec 12 15:08:44 2012
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2003/04/29 05:36:20 thorpej Exp $
+# $NetBSD: Makefile,v 1.4 2012/12/12 15:08:44 matt Exp $
S= ${.CURDIR}/../../../../..
@@ -10,6 +10,8 @@ LOADADDR= 0xa020
CPPFLAGS+= -DCONSPEED=115200
CPPFLAGS+= -DCONADDR=0xfe80UL
+CPUFLAGS= -mcpu=xscale
+
LDSCRIPT= ${.CURDIR}/ldscript
SRCS+= iq80321.c ns16550.c i80321_mem.c
Index: src/sys/arch/evbarm/stand/gzboot/TS7200_flash_0x6066/Makefile
diff -u src/sys/arch/evbarm/stand/gzboot/TS7200_flash_0x6066/Makefile:1.2 src/sys/arch/evbarm/stand/gzboot/TS7200_flash_0x6066/Makefile:1.3
--- src/sys/arch/evbarm/stand/gzboot/TS7200_flash_0x6066/Makefile:1.2 Sun Dec 11 12:17:11 2005
+++ src/sys/arch/evbarm/stand/gzboot/TS7200_flash_0x6066/Makefile Wed Dec 12 15:08:45 2012
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2005/12/11 12:17:11 christos Exp $
+# $NetBSD: Makefile,v 1.3 2012/12/12 15:08:45 matt Exp $
S= ${.CURDIR}/../../../../..
@@ -10,
CVS commit: src/sys/arch/evbarm/stand/gzboot
Module Name:src
Committed By: khorben
Date: Mon Aug 13 10:25:02 UTC 2012
Modified Files:
src/sys/arch/evbarm/stand/gzboot: Makefile.gzboot
Log Message:
Fixed build with USE_SSP=yes
ok christos@
To generate a diff of this commit:
cvs rdiff -u -r1.19 -r1.20 src/sys/arch/evbarm/stand/gzboot/Makefile.gzboot
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/evbarm/stand/gzboot/Makefile.gzboot
diff -u src/sys/arch/evbarm/stand/gzboot/Makefile.gzboot:1.19 src/sys/arch/evbarm/stand/gzboot/Makefile.gzboot:1.20
--- src/sys/arch/evbarm/stand/gzboot/Makefile.gzboot:1.19 Mon Aug 6 02:14:15 2012
+++ src/sys/arch/evbarm/stand/gzboot/Makefile.gzboot Mon Aug 13 10:25:02 2012
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.gzboot,v 1.19 2012/08/06 02:14:15 matt Exp $
+# $NetBSD: Makefile.gzboot,v 1.20 2012/08/13 10:25:02 khorben Exp $
NOMAN= # defined
@@ -49,6 +49,7 @@ CPPFLAGS+= -DMAXIMAGESIZE=${MAXIMAGESIZE
CPPFLAGS+= -DLOADADDR=${LOADADDR}
COPTS+= -ffreestanding
+COPTS+= -fno-stack-protector
CWARNFLAGS+= -Werror
CWARNFLAGS+= -Wall -Wmissing-prototypes -Wstrict-prototypes -Wpointer-arith
CVS commit: src/sys/arch/evbarm/stand/gzboot
Module Name:src
Committed By: matt
Date: Mon Aug 6 02:14:16 UTC 2012
Modified Files:
src/sys/arch/evbarm/stand/gzboot: Makefile.gzboot
src/sys/arch/evbarm/stand/gzboot/ADI_BRH_flash_0x0014: ldscript
src/sys/arch/evbarm/stand/gzboot/GEMINI_dram_0x0160: Makefile
ldscript
src/sys/arch/evbarm/stand/gzboot/IQ80310_flash_0x0008: ldscript
src/sys/arch/evbarm/stand/gzboot/IQ80321_flash_0xf008: ldscript
src/sys/arch/evbarm/stand/gzboot/SMDK2410_flash_0x: ldscript
src/sys/arch/evbarm/stand/gzboot/SMDK2800_flash_0x: ldscript
src/sys/arch/evbarm/stand/gzboot/SMDK2800_flash_0x0010: ldscript
src/sys/arch/evbarm/stand/gzboot/TS7200_flash_0x6066: ldscript
Log Message:
Fix to allow EABI compilation.
Make sure to DISCARD new .ARM.attributes and .ARM.ebxidx sections.
To generate a diff of this commit:
cvs rdiff -u -r1.18 -r1.19 src/sys/arch/evbarm/stand/gzboot/Makefile.gzboot
cvs rdiff -u -r1.5 -r1.6 \
src/sys/arch/evbarm/stand/gzboot/ADI_BRH_flash_0x0014/ldscript
cvs rdiff -u -r1.2 -r1.3 \
src/sys/arch/evbarm/stand/gzboot/GEMINI_dram_0x0160/Makefile \
src/sys/arch/evbarm/stand/gzboot/GEMINI_dram_0x0160/ldscript
cvs rdiff -u -r1.4 -r1.5 \
src/sys/arch/evbarm/stand/gzboot/IQ80310_flash_0x0008/ldscript
cvs rdiff -u -r1.7 -r1.8 \
src/sys/arch/evbarm/stand/gzboot/IQ80321_flash_0xf008/ldscript
cvs rdiff -u -r1.4 -r1.5 \
src/sys/arch/evbarm/stand/gzboot/SMDK2410_flash_0x/ldscript
cvs rdiff -u -r1.4 -r1.5 \
src/sys/arch/evbarm/stand/gzboot/SMDK2800_flash_0x/ldscript
cvs rdiff -u -r1.4 -r1.5 \
src/sys/arch/evbarm/stand/gzboot/SMDK2800_flash_0x0010/ldscript
cvs rdiff -u -r1.3 -r1.4 \
src/sys/arch/evbarm/stand/gzboot/TS7200_flash_0x6066/ldscript
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/evbarm/stand/gzboot/Makefile.gzboot
diff -u src/sys/arch/evbarm/stand/gzboot/Makefile.gzboot:1.18 src/sys/arch/evbarm/stand/gzboot/Makefile.gzboot:1.19
--- src/sys/arch/evbarm/stand/gzboot/Makefile.gzboot:1.18 Fri Jul 20 14:59:33 2012
+++ src/sys/arch/evbarm/stand/gzboot/Makefile.gzboot Mon Aug 6 02:14:15 2012
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.gzboot,v 1.18 2012/07/20 14:59:33 matt Exp $
+# $NetBSD: Makefile.gzboot,v 1.19 2012/08/06 02:14:15 matt Exp $
NOMAN= # defined
@@ -90,7 +90,7 @@ cleandir distclean: .WAIT cleanlibdir
cleanlibdir:
-rm -rf lib
-LDFLAGS= -M -T ${LDSCRIPT}
+LDFLAGS= -M -T ${LDSCRIPT} --fix-v4bx
LIBLIST=${LIBSA} ${LIBZ} ${LIBSA} ${LIBKERN} ${LIBSA}
Index: src/sys/arch/evbarm/stand/gzboot/ADI_BRH_flash_0x0014/ldscript
diff -u src/sys/arch/evbarm/stand/gzboot/ADI_BRH_flash_0x0014/ldscript:1.5 src/sys/arch/evbarm/stand/gzboot/ADI_BRH_flash_0x0014/ldscript:1.6
--- src/sys/arch/evbarm/stand/gzboot/ADI_BRH_flash_0x0014/ldscript:1.5 Sat Sep 26 07:29:55 2009
+++ src/sys/arch/evbarm/stand/gzboot/ADI_BRH_flash_0x0014/ldscript Mon Aug 6 02:14:15 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: ldscript,v 1.5 2009/09/26 07:29:55 skrll Exp $ */
+/* $NetBSD: ldscript,v 1.6 2012/08/06 02:14:15 matt Exp $ */
OUTPUT_ARCH(arm)
ENTRY(FLASH)
@@ -14,6 +14,8 @@ SECTIONS
{
FLASH = 0x0014;
+ /DISCARD/ : { *(.ARM.attributes*) *(.ARM.exidx) }
+
/* Read-only sections, merged into text segment: */
__text_store = FLASH;
.text :
Index: src/sys/arch/evbarm/stand/gzboot/GEMINI_dram_0x0160/Makefile
diff -u src/sys/arch/evbarm/stand/gzboot/GEMINI_dram_0x0160/Makefile:1.2 src/sys/arch/evbarm/stand/gzboot/GEMINI_dram_0x0160/Makefile:1.3
--- src/sys/arch/evbarm/stand/gzboot/GEMINI_dram_0x0160/Makefile:1.2 Mon Nov 10 20:30:12 2008
+++ src/sys/arch/evbarm/stand/gzboot/GEMINI_dram_0x0160/Makefile Mon Aug 6 02:14:15 2012
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2008/11/10 20:30:12 cliff Exp $
+# $NetBSD: Makefile,v 1.3 2012/08/06 02:14:15 matt Exp $
S= ${.CURDIR}/../../../../..
@@ -12,6 +12,8 @@ CPPFLAGS+= -DCONADDR=0x4200UL
CPPFLAGS+= -DNS16550_AX4
CPPFLAGS+= -DNS16550_FREQ=4800
+CPUFLAGS+= -march=armv4
+
LDSCRIPT= ${.CURDIR}/ldscript
# SRCS+= gemini.c ns16550.c gemini_mem.c
Index: src/sys/arch/evbarm/stand/gzboot/GEMINI_dram_0x0160/ldscript
diff -u src/sys/arch/evbarm/stand/gzboot/GEMINI_dram_0x0160/ldscript:1.2 src/sys/arch/evbarm/stand/gzboot/GEMINI_dram_0x0160/ldscript:1.3
--- src/sys/arch/evbarm/stand/gzboot/GEMINI_dram_0x0160/ldscript:1.2 Sat Sep 26 07:29:55 2009
+++ src/sys/arch/evbarm/stand/gzboot/GEMINI_dram_0x0160/ldscript Mon Aug 6 02:14:15 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: ldscript,v 1.2 2009/09/26 07:29:55 skrll Exp $ */
+/* $NetBSD: ldscript,v 1.3 2012/08/06 02:14:15 matt Exp $ */
OUTPUT_FORMAT("elf32-littlearm", "elf32-bigarm",
"elf32-littlearm")
@@ -16,6 +16,8 @@ SECTIONS
{
GZBOOT = 0x0160;
CVS commit: src/sys/arch/evbarm/stand/gzboot
Module Name:src
Committed By: matt
Date: Fri Jul 20 14:59:34 UTC 2012
Modified Files:
src/sys/arch/evbarm/stand/gzboot: Makefile.gzboot
Log Message:
Add missing ${_MKTARGET_LINK}
To generate a diff of this commit:
cvs rdiff -u -r1.17 -r1.18 src/sys/arch/evbarm/stand/gzboot/Makefile.gzboot
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/evbarm/stand/gzboot/Makefile.gzboot
diff -u src/sys/arch/evbarm/stand/gzboot/Makefile.gzboot:1.17 src/sys/arch/evbarm/stand/gzboot/Makefile.gzboot:1.18
--- src/sys/arch/evbarm/stand/gzboot/Makefile.gzboot:1.17 Sat Jan 22 19:19:17 2011
+++ src/sys/arch/evbarm/stand/gzboot/Makefile.gzboot Fri Jul 20 14:59:33 2012
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.gzboot,v 1.17 2011/01/22 19:19:17 joerg Exp $
+# $NetBSD: Makefile.gzboot,v 1.18 2012/07/20 14:59:33 matt Exp $
NOMAN= # defined
@@ -116,5 +116,6 @@ FILES= ${PROGSYM}
.include
${PROGSYM}: ${STARTFILE} ${OBJS} ${LIBSA} ${LIBZ} ${LIBKERN}
+ ${_MKTARGET_LINK}
${LD} -o ${.TARGET} ${LDFLAGS} ${STARTFILE} \
${OBJS} ${LIBLIST} > ${BASE}.list
CVS commit: src/sys/arch/evbarm/stand/gzboot
Module Name:src
Committed By: skrll
Date: Sat Jun 2 20:50:41 UTC 2012
Modified Files:
src/sys/arch/evbarm/stand/gzboot: Makefile
Log Message:
Whitespace.
To generate a diff of this commit:
cvs rdiff -u -r1.9 -r1.10 src/sys/arch/evbarm/stand/gzboot/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/evbarm/stand/gzboot/Makefile
diff -u src/sys/arch/evbarm/stand/gzboot/Makefile:1.9 src/sys/arch/evbarm/stand/gzboot/Makefile:1.10
--- src/sys/arch/evbarm/stand/gzboot/Makefile:1.9 Thu Oct 30 15:33:42 2008
+++ src/sys/arch/evbarm/stand/gzboot/Makefile Sat Jun 2 20:50:41 2012
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.9 2008/10/30 15:33:42 cliff Exp $
+# $NetBSD: Makefile,v 1.10 2012/06/02 20:50:41 skrll Exp $
.if ${MACHINE_ARCH} == "arm"
# Little endian platforms
SUBDIR= ADI_BRH_flash_0x0014
-SUBDIR+= GEMINI_dram_0x0160
+SUBDIR+= GEMINI_dram_0x0160
SUBDIR+= IQ80310_flash_0x0008
SUBDIR+= IQ80321_flash_0xf008
SUBDIR+= SMDK2410_flash_0x
CVS commit: src/sys/arch/evbarm/stand/gzboot
Module Name:src
Committed By: skrll
Date: Sat Sep 26 07:29:56 UTC 2009
Modified Files:
src/sys/arch/evbarm/stand/gzboot/ADI_BRH_flash_0x0014: ldscript
src/sys/arch/evbarm/stand/gzboot/GEMINI_dram_0x0160: ldscript
src/sys/arch/evbarm/stand/gzboot/IQ80310_flash_0x0008: ldscript
src/sys/arch/evbarm/stand/gzboot/IQ80321_flash_0xf008: ldscript
src/sys/arch/evbarm/stand/gzboot/SMDK2410_flash_0x: ldscript
src/sys/arch/evbarm/stand/gzboot/SMDK2800_flash_0x: ldscript
src/sys/arch/evbarm/stand/gzboot/SMDK2800_flash_0x0010: ldscript
src/sys/arch/evbarm/stand/gzboot/TS7200_flash_0x6066: ldscript
Log Message:
Deal with the following change to ld:
* The default output section LMA has changed for allocatable sections from
being equal to VMA, to keeping the difference between LMA and VMA the same as
the previous output section in the same region. This is a more useful
default when using overlays and other cases where you specify an LMA
differing from the VMA for some sections.
To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 \
src/sys/arch/evbarm/stand/gzboot/ADI_BRH_flash_0x0014/ldscript
cvs rdiff -u -r1.1 -r1.2 \
src/sys/arch/evbarm/stand/gzboot/GEMINI_dram_0x0160/ldscript
cvs rdiff -u -r1.3 -r1.4 \
src/sys/arch/evbarm/stand/gzboot/IQ80310_flash_0x0008/ldscript
cvs rdiff -u -r1.6 -r1.7 \
src/sys/arch/evbarm/stand/gzboot/IQ80321_flash_0xf008/ldscript
cvs rdiff -u -r1.3 -r1.4 \
src/sys/arch/evbarm/stand/gzboot/SMDK2410_flash_0x/ldscript
cvs rdiff -u -r1.3 -r1.4 \
src/sys/arch/evbarm/stand/gzboot/SMDK2800_flash_0x/ldscript
cvs rdiff -u -r1.3 -r1.4 \
src/sys/arch/evbarm/stand/gzboot/SMDK2800_flash_0x0010/ldscript
cvs rdiff -u -r1.2 -r1.3 \
src/sys/arch/evbarm/stand/gzboot/TS7200_flash_0x6066/ldscript
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/evbarm/stand/gzboot/ADI_BRH_flash_0x0014/ldscript
diff -u src/sys/arch/evbarm/stand/gzboot/ADI_BRH_flash_0x0014/ldscript:1.4 src/sys/arch/evbarm/stand/gzboot/ADI_BRH_flash_0x0014/ldscript:1.5
--- src/sys/arch/evbarm/stand/gzboot/ADI_BRH_flash_0x0014/ldscript:1.4 Sun Dec 11 12:17:10 2005
+++ src/sys/arch/evbarm/stand/gzboot/ADI_BRH_flash_0x0014/ldscript Sat Sep 26 07:29:55 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: ldscript,v 1.4 2005/12/11 12:17:10 christos Exp $ */
+/* $NetBSD: ldscript,v 1.5 2009/09/26 07:29:55 skrll Exp $ */
OUTPUT_ARCH(arm)
ENTRY(FLASH)
@@ -48,6 +48,7 @@
__bss_start = .;
__bss_start__ = .;
.sbss :
+ AT (ADDR(.sbss))
{
PROVIDE (__sbss_start = .);
PROVIDE (___sbss_start = .);
@@ -59,6 +60,7 @@
PROVIDE (___sbss_end = .);
} > sdram
.bss :
+ AT (ADDR(.bss))
{
*(.dynbss)
*(.bss)
Index: src/sys/arch/evbarm/stand/gzboot/GEMINI_dram_0x0160/ldscript
diff -u src/sys/arch/evbarm/stand/gzboot/GEMINI_dram_0x0160/ldscript:1.1 src/sys/arch/evbarm/stand/gzboot/GEMINI_dram_0x0160/ldscript:1.2
--- src/sys/arch/evbarm/stand/gzboot/GEMINI_dram_0x0160/ldscript:1.1 Thu Oct 30 06:23:13 2008
+++ src/sys/arch/evbarm/stand/gzboot/GEMINI_dram_0x0160/ldscript Sat Sep 26 07:29:55 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: ldscript,v 1.1 2008/10/30 06:23:13 cliff Exp $ */
+/* $NetBSD: ldscript,v 1.2 2009/09/26 07:29:55 skrll Exp $ */
OUTPUT_FORMAT("elf32-littlearm", "elf32-bigarm",
"elf32-littlearm")
@@ -50,6 +50,7 @@
__bss_start = .;
__bss_start__ = .;
.sbss :
+ AT (ADDR(.sbss))
{
PROVIDE (__sbss_start = .);
PROVIDE (___sbss_start = .);
@@ -61,6 +62,7 @@
PROVIDE (___sbss_end = .);
} > gzboot
.bss :
+ AT (ADDR(.bss))
{
*(.dynbss)
*(.bss)
Index: src/sys/arch/evbarm/stand/gzboot/IQ80310_flash_0x0008/ldscript
diff -u src/sys/arch/evbarm/stand/gzboot/IQ80310_flash_0x0008/ldscript:1.3 src/sys/arch/evbarm/stand/gzboot/IQ80310_flash_0x0008/ldscript:1.4
--- src/sys/arch/evbarm/stand/gzboot/IQ80310_flash_0x0008/ldscript:1.3 Sun Dec 11 12:17:10 2005
+++ src/sys/arch/evbarm/stand/gzboot/IQ80310_flash_0x0008/ldscript Sat Sep 26 07:29:55 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: ldscript,v 1.3 2005/12/11 12:17:10 christos Exp $ */
+/* $NetBSD: ldscript,v 1.4 2009/09/26 07:29:55 skrll Exp $ */
OUTPUT_FORMAT("elf32-littlearm", "elf32-bigarm",
"elf32-littlearm")
@@ -50,6 +50,7 @@
__bss_start = .;
__bss_start__ = .;
.sbss :
+ AT (ADDR(.sbss))
{
PROVIDE (__sbss_start = .);
PROVIDE (___sbss_start = .);
@@ -61,6 +62,7 @@
PROVIDE (___sbss_end = .);
} > sdram
.bss :
+ AT (ADDR(.bss))
{
*(.dynbss)
*(.bss)
Index: src/sys/arch/evbarm/stand/gzboot/IQ80321_flash_0xf008/ldscript
diff -u src/sys/arch/evbarm/stand/gzboot/IQ80321_flash_0xf008/ldscript:1.6 src/sys/arch/ev
