diff --git a/sys/arch/evbarm/conf/Makefile.evbarm.inc b/sys/arch/evbarm/conf/Makefile.evbarm.inc index 6c446b214e9d..88386b85ca79 100644 --- a/sys/arch/evbarm/conf/Makefile.evbarm.inc +++ b/sys/arch/evbarm/conf/Makefile.evbarm.inc @@ -1,105 +1,11 @@ -# $NetBSD: Makefile.evbarm.inc,v 1.15 2003/01/03 02:02:14 thorpej Exp $ +# $NetBSD: Makefile.evbarm.inc,v 1.16 2003/01/03 02:16:26 thorpej Exp $ SYSTEM_LD_TAIL_EXTRA=; \ echo "${DBSYM} $@ || true"; \ ${DBSYM} $@ || true -.if (${BOARDTYPE} == "integrator") -GENASSYM_EXTRAS+= ${THISARM}/ifpga/genassym.cf -SYSTEM_FIRST_OBJ= intmmu.o -SYSTEM_FIRST_SFILE= ${THISARM}/integrator/intmmu.S - -KERNEL_BASE_PHYS=0x00200000 -KERNEL_BASE_VIRT=0xc0200000 - -SYSTEM_LD_TAIL_EXTRA+=; \ - echo ${OBJCOPY} -S -O srec $@ $@.srec; \ - ${OBJCOPY} -S -O srec $@ $@.srec; \ - echo ${OBJCOPY} -S -O binary $@ $@.bin; \ - ${OBJCOPY} -S -O binary $@ $@.bin - -EXTRA_KERNELS+= ${KERNELS:@.KERNEL.@${.KERNEL.}.srec@} -EXTRA_KERNELS+= ${KERNELS:@.KERNEL.@${.KERNEL.}.bin@} -.endif - -.if (${BOARDTYPE} == "ixm1200") -SYSTEM_FIRST_OBJ= ixm1200_start.o -SYSTEM_FIRST_SFILE= ${THISARM}/ixm1200/ixm1200_start.S - -KERNEL_BASE_PHYS=0xc0200100 -KERNEL_BASE_VIRT=0xc0200100 - -SYSTEM_LD_TAIL_EXTRA= -.endif - -.if (${BOARDTYPE} == "iq80310") -SYSTEM_FIRST_OBJ= iq80310_start.o -SYSTEM_FIRST_SFILE= ${THISARM}/iq80310/iq80310_start.S - -KERNEL_BASE_PHYS=0xa0200000 -KERNEL_BASE_VIRT=0xc0200000 - -SYSTEM_LD_TAIL_EXTRA+=; \ - echo ${OBJCOPY} -S -O srec $@ $@.srec; \ - ${OBJCOPY} -S -O srec $@ $@.srec; \ - echo ${OBJCOPY} -S -O binary $@ $@.bin; \ - ${OBJCOPY} -S -O binary $@ $@.bin - -EXTRA_KERNELS+= ${KERNELS:@.KERNEL.@${.KERNEL.}.srec@} -EXTRA_KERNELS+= ${KERNELS:@.KERNEL.@${.KERNEL.}.bin@} -.endif - -.if (${BOARDTYPE} == "iq80321") -SYSTEM_FIRST_OBJ= iq80321_start.o -SYSTEM_FIRST_SFILE= ${THISARM}/iq80321/iq80321_start.S - -KERNEL_BASE_PHYS=0x00200000 -KERNEL_BASE_VIRT=0xc0200000 - -SYSTEM_LD_TAIL_EXTRA+=; \ - echo ${OBJCOPY} -S -O srec $@ $@.srec; \ - ${OBJCOPY} -S -O srec $@ $@.srec; \ - echo ${OBJCOPY} -S -O binary $@ $@.bin; \ - ${OBJCOPY} -S -O binary $@ $@.bin - -EXTRA_KERNELS+= ${KERNELS:@.KERNEL.@${.KERNEL.}.srec@} -EXTRA_KERNELS+= ${KERNELS:@.KERNEL.@${.KERNEL.}.bin@} -.endif - -.if (${BOARDTYPE} == "lubbock" || ${BOARDTYPE} == "g4250ebx") -SYSTEM_FIRST_OBJ= ${BOARDTYPE}_start.o -SYSTEM_FIRST_SFILE= ${THISARM}/${BOARDTYPE}/${BOARDTYPE}_start.S - -KERNEL_BASE_PHYS=0xa0200000 -KERNEL_BASE_VIRT=0xc0200000 - -#GENASSYM_EXTRAS+= ${THISARM}/${BOARDTYPE}/genassym.cf -SYSTEM_LD_TAIL_EXTRA+=; \ - echo ${OBJCOPY} -S -O binary $@ $@.bin; \ - ${OBJCOPY} -S -O binary $@ $@.bin; \ - echo gzip \< $@.bin \> $@.bin.gz; \ - gzip < $@.bin > $@.bin.gz - -EXTRA_KERNELS+= ${KERNELS:@.KERNEL.@${.KERNEL.}.bin@} -EXTRA_KERNELS+= ${KERNELS:@.KERNEL.@${.KERNEL.}.bin.gz@} -.endif - -.if (${BOARDTYPE} == "smdk2800") -SYSTEM_FIRST_OBJ= ${BOARDTYPE}_start.o -SYSTEM_FIRST_SFILE= ${THISARM}/smdk2xx0/${BOARDTYPE}_start.S - -KERNEL_BASE_PHYS=0x08200000 -KERNEL_BASE_VIRT=0xc0200000 - -#GENASSYM_EXTRAS+= ${THISARM}/${BOARDTYPE}/genassym.cf -SYSTEM_LD_TAIL_EXTRA+=; \ - echo ${OBJCOPY} -S -O srec $@ $@.srec; \ - ${OBJCOPY} -S -O srec $@ $@.srec; \ - echo ${OBJCOPY} -S -O binary $@ $@.bin; \ - ${OBJCOPY} -S -O binary $@ $@.bin; - -EXTRA_KERNELS+= ${KERNELS:@.KERNEL.@${.KERNEL.}.srec@} -EXTRA_KERNELS+= ${KERNELS:@.KERNEL.@${.KERNEL.}.bin@} +.if defined(BOARDMKFRAG) # Must be a full pathname. +.include "${BOARDMKFRAG}" .endif .if defined(KERNEL_BASE_PHYS) diff --git a/sys/arch/evbarm/conf/mk.g4250ebx b/sys/arch/evbarm/conf/mk.g4250ebx new file mode 100644 index 000000000000..59f8fc62b7a3 --- /dev/null +++ b/sys/arch/evbarm/conf/mk.g4250ebx @@ -0,0 +1,16 @@ +# $NetBSD: mk.g4250ebx,v 1.1 2003/01/03 02:16:26 thorpej Exp $ + +SYSTEM_FIRST_OBJ= g4250ebx_start.o +SYSTEM_FIRST_SFILE= ${THISARM}/g4250ebx/g4250ebx_start.S + +KERNEL_BASE_PHYS=0xa0200000 +KERNEL_BASE_VIRT=0xc0200000 + +SYSTEM_LD_TAIL_EXTRA+=; \ + echo ${OBJCOPY} -S -O binary $@ $@.bin; \ + ${OBJCOPY} -S -O binary $@ $@.bin; \ + echo gzip \< $@.bin \> $@.bin.gz; \ + gzip < $@.bin > $@.bin.gz + +EXTRA_KERNELS+= ${KERNELS:@.KERNEL.@${.KERNEL.}.bin@} +EXTRA_KERNELS+= ${KERNELS:@.KERNEL.@${.KERNEL.}.bin.gz@} diff --git a/sys/arch/evbarm/conf/mk.integrator b/sys/arch/evbarm/conf/mk.integrator new file mode 100644 index 000000000000..afee3b6a8780 --- /dev/null +++ b/sys/arch/evbarm/conf/mk.integrator @@ -0,0 +1,17 @@ +# $NetBSD: mk.integrator,v 1.1 2003/01/03 02:16:27 thorpej Exp $ + +GENASSYM_EXTRAS+= ${THISARM}/ifpga/genassym.cf +SYSTEM_FIRST_OBJ= intmmu.o +SYSTEM_FIRST_SFILE= ${THISARM}/integrator/intmmu.S + +KERNEL_BASE_PHYS=0x00200000 +KERNEL_BASE_VIRT=0xc0200000 + +SYSTEM_LD_TAIL_EXTRA+=; \ + echo ${OBJCOPY} -S -O srec $@ $@.srec; \ + ${OBJCOPY} -S -O srec $@ $@.srec; \ + echo ${OBJCOPY} -S -O binary $@ $@.bin; \ + ${OBJCOPY} -S -O binary $@ $@.bin + +EXTRA_KERNELS+= ${KERNELS:@.KERNEL.@${.KERNEL.}.srec@} +EXTRA_KERNELS+= ${KERNELS:@.KERNEL.@${.KERNEL.}.bin@} diff --git a/sys/arch/evbarm/conf/mk.iq80310 b/sys/arch/evbarm/conf/mk.iq80310 new file mode 100644 index 000000000000..479092ac2a84 --- /dev/null +++ b/sys/arch/evbarm/conf/mk.iq80310 @@ -0,0 +1,16 @@ +# $NetBSD: mk.iq80310,v 1.1 2003/01/03 02:16:27 thorpej Exp $ + +SYSTEM_FIRST_OBJ= iq80310_start.o +SYSTEM_FIRST_SFILE= ${THISARM}/iq80310/iq80310_start.S + +KERNEL_BASE_PHYS=0xa0200000 +KERNEL_BASE_VIRT=0xc0200000 + +SYSTEM_LD_TAIL_EXTRA+=; \ + echo ${OBJCOPY} -S -O srec $@ $@.srec; \ + ${OBJCOPY} -S -O srec $@ $@.srec; \ + echo ${OBJCOPY} -S -O binary $@ $@.bin; \ + ${OBJCOPY} -S -O binary $@ $@.bin + +EXTRA_KERNELS+= ${KERNELS:@.KERNEL.@${.KERNEL.}.srec@} +EXTRA_KERNELS+= ${KERNELS:@.KERNEL.@${.KERNEL.}.bin@} diff --git a/sys/arch/evbarm/conf/mk.iq80321 b/sys/arch/evbarm/conf/mk.iq80321 new file mode 100644 index 000000000000..9f9c3c20ea32 --- /dev/null +++ b/sys/arch/evbarm/conf/mk.iq80321 @@ -0,0 +1,16 @@ +# $NetBSD: mk.iq80321,v 1.1 2003/01/03 02:16:27 thorpej Exp $ + +SYSTEM_FIRST_OBJ= iq80321_start.o +SYSTEM_FIRST_SFILE= ${THISARM}/iq80321/iq80321_start.S + +KERNEL_BASE_PHYS=0x00200000 +KERNEL_BASE_VIRT=0xc0200000 + +SYSTEM_LD_TAIL_EXTRA+=; \ + echo ${OBJCOPY} -S -O srec $@ $@.srec; \ + ${OBJCOPY} -S -O srec $@ $@.srec; \ + echo ${OBJCOPY} -S -O binary $@ $@.bin; \ + ${OBJCOPY} -S -O binary $@ $@.bin + +EXTRA_KERNELS+= ${KERNELS:@.KERNEL.@${.KERNEL.}.srec@} +EXTRA_KERNELS+= ${KERNELS:@.KERNEL.@${.KERNEL.}.bin@} diff --git a/sys/arch/evbarm/conf/mk.ixm1200 b/sys/arch/evbarm/conf/mk.ixm1200 new file mode 100644 index 000000000000..d46c29489d01 --- /dev/null +++ b/sys/arch/evbarm/conf/mk.ixm1200 @@ -0,0 +1,9 @@ +# $NetBSD: mk.ixm1200,v 1.1 2003/01/03 02:16:28 thorpej Exp $ + +SYSTEM_FIRST_OBJ= ixm1200_start.o +SYSTEM_FIRST_SFILE= ${THISARM}/ixm1200/ixm1200_start.S + +KERNEL_BASE_PHYS=0xc0200100 +KERNEL_BASE_VIRT=0xc0200100 + +SYSTEM_LD_TAIL_EXTRA= diff --git a/sys/arch/evbarm/conf/mk.lubbock b/sys/arch/evbarm/conf/mk.lubbock new file mode 100644 index 000000000000..f99db4be35cb --- /dev/null +++ b/sys/arch/evbarm/conf/mk.lubbock @@ -0,0 +1,16 @@ +# $NetBSD: mk.lubbock,v 1.1 2003/01/03 02:16:28 thorpej Exp $ + +SYSTEM_FIRST_OBJ= lubbock_start.o +SYSTEM_FIRST_SFILE= ${THISARM}/lubbock/lubbock_start.S + +KERNEL_BASE_PHYS=0xa0200000 +KERNEL_BASE_VIRT=0xc0200000 + +SYSTEM_LD_TAIL_EXTRA+=; \ + echo ${OBJCOPY} -S -O binary $@ $@.bin; \ + ${OBJCOPY} -S -O binary $@ $@.bin; \ + echo gzip \< $@.bin \> $@.bin.gz; \ + gzip < $@.bin > $@.bin.gz + +EXTRA_KERNELS+= ${KERNELS:@.KERNEL.@${.KERNEL.}.bin@} +EXTRA_KERNELS+= ${KERNELS:@.KERNEL.@${.KERNEL.}.bin.gz@} diff --git a/sys/arch/evbarm/conf/mk.smdk2xx0 b/sys/arch/evbarm/conf/mk.smdk2xx0 new file mode 100644 index 000000000000..f70bfa0b288b --- /dev/null +++ b/sys/arch/evbarm/conf/mk.smdk2xx0 @@ -0,0 +1,16 @@ +# $NetBSD: mk.smdk2xx0,v 1.1 2003/01/03 02:16:28 thorpej Exp $ + +SYSTEM_FIRST_OBJ= ${BOARDTYPE}_start.o +SYSTEM_FIRST_SFILE= ${THISARM}/smdk2xx0/${BOARDTYPE}_start.S + +KERNEL_BASE_PHYS=0x08200000 +KERNEL_BASE_VIRT=0xc0200000 + +SYSTEM_LD_TAIL_EXTRA+=; \ + echo ${OBJCOPY} -S -O srec $@ $@.srec; \ + ${OBJCOPY} -S -O srec $@ $@.srec; \ + echo ${OBJCOPY} -S -O binary $@ $@.bin; \ + ${OBJCOPY} -S -O binary $@ $@.bin; + +EXTRA_KERNELS+= ${KERNELS:@.KERNEL.@${.KERNEL.}.srec@} +EXTRA_KERNELS+= ${KERNELS:@.KERNEL.@${.KERNEL.}.bin@} diff --git a/sys/arch/evbarm/conf/std.integrator b/sys/arch/evbarm/conf/std.integrator index 8a9380ef6002..20bee5f1e56b 100644 --- a/sys/arch/evbarm/conf/std.integrator +++ b/sys/arch/evbarm/conf/std.integrator @@ -1,4 +1,4 @@ -# $NetBSD: std.integrator,v 1.7 2003/01/02 23:38:01 thorpej Exp $ +# $NetBSD: std.integrator,v 1.8 2003/01/03 02:16:28 thorpej Exp $ # # standard NetBSD/integrator options @@ -19,3 +19,4 @@ options __OLD_INTERRUPT_CODE # XXX for now makeoptions LOADADDRESS="0xa0100000" makeoptions LINKENTRY="-e 0x10000" makeoptions BOARDTYPE="integrator" +makeoptions BOARDMKFRAG="${THISARM}/conf/mk.integrator" diff --git a/sys/arch/evbarm/conf/std.iq80310 b/sys/arch/evbarm/conf/std.iq80310 index 68fab897af9d..9a935b050c7d 100644 --- a/sys/arch/evbarm/conf/std.iq80310 +++ b/sys/arch/evbarm/conf/std.iq80310 @@ -1,4 +1,4 @@ -# $NetBSD: std.iq80310,v 1.13 2003/01/02 23:38:01 thorpej Exp $ +# $NetBSD: std.iq80310,v 1.14 2003/01/03 02:16:28 thorpej Exp $ # # standard NetBSD/evbarm for IQ80310 options @@ -16,6 +16,7 @@ options ARM32 makeoptions LOADADDRESS="0xa0200000" makeoptions BOARDTYPE="iq80310" +makeoptions BOARDMKFRAG="${THISARM}/conf/mk.iq80310" options ARM_INTR_IMPL="" diff --git a/sys/arch/evbarm/conf/std.iq80321 b/sys/arch/evbarm/conf/std.iq80321 index ca262378b22d..28cefe07fe2c 100644 --- a/sys/arch/evbarm/conf/std.iq80321 +++ b/sys/arch/evbarm/conf/std.iq80321 @@ -1,4 +1,4 @@ -# $NetBSD: std.iq80321,v 1.4 2003/01/02 23:38:02 thorpej Exp $ +# $NetBSD: std.iq80321,v 1.5 2003/01/03 02:16:28 thorpej Exp $ # # standard NetBSD/evbarm for IQ80321 options @@ -16,6 +16,7 @@ options ARM32 makeoptions LOADADDRESS="0xa0200000" makeoptions BOARDTYPE="iq80321" +makeoptions BOARDMKFRAG="${THISARM}/conf/mk.iq80321" options ARM_INTR_IMPL="" diff --git a/sys/arch/evbarm/conf/std.ixm1200 b/sys/arch/evbarm/conf/std.ixm1200 index 923c89ebdd7a..92e1d6710d37 100644 --- a/sys/arch/evbarm/conf/std.ixm1200 +++ b/sys/arch/evbarm/conf/std.ixm1200 @@ -1,4 +1,4 @@ -# $NetBSD: std.ixm1200,v 1.4 2003/01/03 01:08:04 thorpej Exp $ +# $NetBSD: std.ixm1200,v 1.5 2003/01/03 02:16:29 thorpej Exp $ # # standard NetBSD/evbarm for IXM1200 options @@ -16,6 +16,7 @@ options ARM32 makeoptions LOADADDRESS="0xC0200000" makeoptions BOARDTYPE="ixm1200" +makeoptions BOARDMKFRAG="${THISARM}/conf/mk.ixm1200" options ARM_INTR_IMPL="" diff --git a/sys/arch/evbarm/conf/std.lubbock b/sys/arch/evbarm/conf/std.lubbock index df4085a972e7..2af2816e918d 100644 --- a/sys/arch/evbarm/conf/std.lubbock +++ b/sys/arch/evbarm/conf/std.lubbock @@ -1,4 +1,4 @@ -# $NetBSD: std.lubbock,v 1.2 2003/01/02 23:38:02 thorpej Exp $ +# $NetBSD: std.lubbock,v 1.3 2003/01/03 02:16:29 thorpej Exp $ # # standard NetBSD/evbarm for LUBBOCK options @@ -17,6 +17,7 @@ options ARM32 makeoptions LOADADDRESS="0xc0200000" makeoptions BOARDTYPE="lubbock" +makeoptions BOARDMKFRAG="${THISARM}/conf/mk.lubbock" options ARM_INTR_IMPL="" diff --git a/sys/arch/evbarm/conf/std.smdk2800 b/sys/arch/evbarm/conf/std.smdk2800 index a9a65fa930de..b8ba9ac6d0c4 100644 --- a/sys/arch/evbarm/conf/std.smdk2800 +++ b/sys/arch/evbarm/conf/std.smdk2800 @@ -1,4 +1,4 @@ -# $NetBSD: std.smdk2800,v 1.2 2003/01/02 23:38:03 thorpej Exp $ +# $NetBSD: std.smdk2800,v 1.3 2003/01/03 02:16:29 thorpej Exp $ # # standard NetBSD/evbarm for IQ80310 options @@ -15,5 +15,6 @@ options EXEC_SCRIPT options ARM32 makeoptions BOARDTYPE="smdk2800" +makeoptions BOARDMKFRAG="${THISARM}/conf/mk.smdk2xx0}" options ARM_INTR_IMPL=""