diff options
| author | Christoffer Dall <cdall@cs.columbia.edu> | 2011-04-04 12:35:13 +0200 |
|---|---|---|
| committer | Christoffer Dall <cdall@cs.columbia.edu> | 2011-04-04 12:35:13 +0200 |
| commit | e0b36f265d52fa3652820a0e5188f0482b12cc54 (patch) | |
| tree | 293c5acbae61c35c109be93e66b02159ceaa23d4 | |
| parent | d1cf723140258fe2178fd0775d872731a4e3d40c (diff) | |
Makefile and path changes
| -rw-r--r-- | Makefile | 8 | ||||
| -rw-r--r-- | model.lds.S | 36 |
2 files changed, 26 insertions, 18 deletions
@@ -30,9 +30,15 @@ LD = $(CROSS_COMPILE)ld all: $(IMAGE) +src_kernel: + cd ../linux-kvm-arm; make -j4 uImage + clean: rm -f $(IMAGE) boot.o model.lds +$(KERNEL): src_kernel ../linux-kvm-arm/arch/arm/boot/uImage + cp ../linux-kvm-arm/arch/arm/boot/uImage $(KERNEL) + $(IMAGE): boot.o model.lds $(KERNEL) $(FILESYSTEM) $(LD) -o $@ --script=model.lds @@ -41,3 +47,5 @@ boot.o: $(BOOTLOADER) model.lds: $(LD_SCRIPT) $(CC) $(CPPFLAGS) -E -P -C -o $@ $< + +.PHONY: all clean src_kernel diff --git a/model.lds.S b/model.lds.S index 816c338..789bafa 100644 --- a/model.lds.S +++ b/model.lds.S @@ -14,33 +14,33 @@ TARGET(binary) INPUT(./boot.o) INPUT(./uImage) #ifdef USE_INITRD -INPUT(./filesystem.cpio.gz) + INPUT(./filesystem.cpio.gz) #endif -#ifdef MACH_MPS -PHYS_OFFSET = 0x10000000; -#elif defined (VEXPRESS) + + + PHYS_OFFSET = 0x80000000; -#else -PHYS_OFFSET = 0x70000000; -#endif + + + SECTIONS { - . = PHYS_OFFSET; - .text : { boot.o } + . = PHYS_OFFSET; + .text : { boot.o } - . = PHYS_OFFSET + 0x8000 - 0x40; - kernel = . + 0x40; - .kernel : { ./uImage } + . = PHYS_OFFSET + 0x8000 - 0x40; + kernel = . + 0x40; + .kernel : { ./uImage } - . = PHYS_OFFSET + 0x00800000; - filesystem = .; + . = PHYS_OFFSET + 0x00800000; + filesystem = .; #ifdef USE_INITRD - .filesystem : { ./filesystem.cpio.gz } - fs_size = . - filesystem; + .filesystem : { ./filesystem.cpio.gz } + fs_size = . - filesystem; #endif - .data : { *(.data) } - .bss : { *(.bss) } + .data : { *(.data) } + .bss : { *(.bss) } } |