diff options
| author | Christoffer Dall <cdall@cs.columbia.edu> | 2011-03-17 03:08:01 +0100 |
|---|---|---|
| committer | Christoffer Dall <cdall@cs.columbia.edu> | 2011-03-17 03:08:01 +0100 |
| commit | c0e5e07d53ccdaf8b79c20cccb7751f07c7fbf2e (patch) | |
| tree | d489c87b33cd4f9e4570ca94231ce0c27c352ba5 | |
| parent | e0b36f265d52fa3652820a0e5188f0482b12cc54 (diff) | |
NFS boot support for A15 without initrd
| -rw-r--r-- | Makefile | 6 | ||||
| -rw-r--r-- | boot.S | 20 |
2 files changed, 17 insertions, 9 deletions
@@ -6,7 +6,7 @@ # found in the LICENSE.txt file. CPPFLAGS += -DSMP -CPPFLAGS += -DUSE_INITRD +#CPPFLAGS += -DUSE_INITRD #CPPFLAGS += -DTHUMB2_KERNEL CPPFLAGS += -march=armv7-a CPPFLAGS += -DVEXPRESS @@ -39,13 +39,13 @@ clean: $(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) +$(IMAGE): boot.o model.lds $(KERNEL) $(FILESYSTEM) Makefile $(LD) -o $@ --script=model.lds boot.o: $(BOOTLOADER) $(CC) $(CPPFLAGS) -c -o $@ $< -model.lds: $(LD_SCRIPT) +model.lds: $(LD_SCRIPT) Makefile $(CC) $(CPPFLAGS) -E -P -C -o $@ $< .PHONY: all clean src_kernel @@ -44,10 +44,10 @@ _start: mov pc, r1 @ branch to the given address #endif + @ @ UART initialisation (38400 8N1) @ -2: #ifdef MACH_MPS ldr r0, =0x1f005000 @ UART3 base (MPS) #elif defined (VEXPRESS) @@ -91,15 +91,23 @@ atags: .long 0x54410009 #ifdef MACH_MPS .asciz "rdinit=/bin/sh console=ttyAMA3 mem=4M earlyprintk" -#elif defined(USE_INITRD) -#ifdef VEXPRESS - .asciz "console=ttyAMA0 mem=512M mem=512M@0x880000000 earlyprintk" -#else - .asciz "console=ttyAMA0 mem=256M earlyprintk" +#elif defined(VEXPRESS) + +#ifdef USE_INITRD + .asciz "console=ttyAMA0 mem=512M mem=512M@0x880000000 earlyprintk ip=192.168.27.200::192.168.27.1:255.255.255.0:angstrom:eth0:off" +#else /* VEXPRESS && !USE_INITRD */ + .asciz "console=ttyAMA0 mem=512M mem=512M@0x880000000 earlyprintk root=/dev/nfs nfsroot=192.168.27.93:/srv/nfs_root,tcp rw ip=dhcp nfsrootdebug" #endif + +#else /* ! VEXPRESS && ! MACH_MPS */ + +#ifdef USE_INITRD + .asciz "console=ttyAMA0 mem=256M earlyprintk" #else .asciz "root=/dev/nfs nfsroot=10.1.77.43:/work/debootstrap/arm ip=dhcp console=ttyAMA0 mem=256M earlyprintk" #endif + +#endif .align 2 1: |