diff options
author | Waldemar Brodkorb <wbx@openadk.org> | 2010-02-07 22:01:27 +0100 |
---|---|---|
committer | Waldemar Brodkorb <wbx@openadk.org> | 2010-02-07 22:01:27 +0100 |
commit | 7de93724af9791bad0a8e887d02bf7a3a872305c (patch) | |
tree | c4de7f2ecaa01cc7cf371eb3b771a6b8a8f9a9de /target/rb532 | |
parent | bd1730cdff6b88d54d5fdb3d63d5733ca33abe59 (diff) | |
parent | 254ae86e16cddf282b36c0593148e24151ce1f96 (diff) |
Merge branch 'master' of git+ssh://openadk.org/git/openadk
Diffstat (limited to 'target/rb532')
-rw-r--r-- | target/rb532/Makefile | 32 | ||||
-rw-r--r-- | target/rb532/TODO | 1 | ||||
-rw-r--r-- | target/rb532/kernel.config | 4 | ||||
-rw-r--r-- | target/rb532/patches/cfgfs.patch | 18 |
4 files changed, 41 insertions, 14 deletions
diff --git a/target/rb532/Makefile b/target/rb532/Makefile index 27a070c31..88145c64c 100644 --- a/target/rb532/Makefile +++ b/target/rb532/Makefile @@ -11,28 +11,38 @@ OSTRIP:=-R .reginfo -R .notes -R .note -R .comment -R .mdebug -R .note.gnu.build kernel-install: $(TARGET_CROSS)objcopy $(OSTRIP) -S $(LINUX_DIR)/vmlinux \ - $(BIN_DIR)/${ADK_TARGET}-${FS}-kernel + $(TARGET_DIR)/boot/kernel + cp $(TARGET_DIR)/boot/kernel \ + $(BUILD_DIR)/${ADK_TARGET}-${FS}-kernel ifeq ($(FS),ext2-cf) -imageinstall: $(BIN_DIR)/$(ROOTFSTARBALL) +imageinstall: $(BIN_DIR)/$(ROOTFSUSERTARBALL) + @cp $(BUILD_DIR)/${ADK_TARGET}-${FS}-kernel \ + $(BIN_DIR)/${ADK_TARGET}-${FS}-kernel @echo @echo 'The kernel file is: ${BIN_DIR}/${ADK_TARGET}-${FS}-kernel' - @echo "The RootFS tarball is: $(BIN_DIR)/$(ROOTFSTARBALL)," - @echo 'Login as user root with password linux123 via ssh or console' + @echo "The RootFS tarball is: $(BIN_DIR)/$(ROOTFSUSERTARBALL)" + @echo "Boot the board via network (tftp/nfsroot) and use adkinstall." + @echo "If you just want to update, use adkupdate." + @echo 'Login as user root with password linux123 via ssh or console.' endif ifeq ($(FS),nfsroot) -imageinstall: $(BIN_DIR)/$(ROOTFSTARBALL) +imageinstall: $(BIN_DIR)/$(ROOTFSUSERTARBALL) + @cp $(BUILD_DIR)/${ADK_TARGET}-${FS}-kernel \ + $(BIN_DIR)/${ADK_TARGET}-${FS}-kernel @echo @echo 'The kernel file is: ${BIN_DIR}/${ADK_TARGET}-${FS}-kernel' - @echo 'The nfs root tarball is: ${BIN_DIR}/${ROOTFSTARBALL}' - @echo 'Login as user root with password linux123 via ssh or console' + @echo 'The nfs root tarball is: ${BIN_DIR}/${ROOTFSUSERTARBALL}' + @echo 'Login as user root with password linux123 via ssh or console.' endif ifeq ($(FS),yaffs) imageinstall: $(BIN_DIR)/$(ROOTFSTARBALL) - @echo - @echo 'The kernel file is: ${BIN_DIR}/${ADK_TARGET}-${FS}-kernel' - @echo "The RootFS tarball is: $(BIN_DIR)/$(ROOTFSTARBALL)," - @echo 'Login as user root with password linux123 via ssh or console' + @echo + @echo "The RootFS tarball is:" + @echo "$(BIN_DIR)/$(ROOTFSTARBALL)" + @echo "Boot the board via network (tftp/nfsroot) and use adkinstall." + @echo "If you just want to update, use adkupdate." + @echo 'Login as user root with password linux123 via ssh or console.' endif diff --git a/target/rb532/TODO b/target/rb532/TODO deleted file mode 100644 index f48d0f482..000000000 --- a/target/rb532/TODO +++ /dev/null @@ -1 +0,0 @@ -- implement cfgfs for NAND/YAFFS2 rootfs diff --git a/target/rb532/kernel.config b/target/rb532/kernel.config index f9ce20f75..a947a5470 100644 --- a/target/rb532/kernel.config +++ b/target/rb532/kernel.config @@ -1,7 +1,7 @@ # # Automatically generated make config: don't edit # Linux kernel version: 2.6.32 -# Sat Jan 30 22:33:23 2010 +# Mon Feb 1 20:33:44 2010 # CONFIG_MIPS=y @@ -398,7 +398,7 @@ CONFIG_MTD_PARTITIONS=y # # User Modules And Translation Layers # -# CONFIG_MTD_CHAR is not set +CONFIG_MTD_CHAR=y CONFIG_MTD_BLKDEVS=y CONFIG_MTD_BLOCK=y # CONFIG_FTL is not set diff --git a/target/rb532/patches/cfgfs.patch b/target/rb532/patches/cfgfs.patch new file mode 100644 index 000000000..ed090bf3c --- /dev/null +++ b/target/rb532/patches/cfgfs.patch @@ -0,0 +1,18 @@ +diff -Nur linux-2.6.32.orig/arch/mips/rb532/devices.c linux-2.6.32/arch/mips/rb532/devices.c +--- linux-2.6.32.orig/arch/mips/rb532/devices.c 2009-12-03 04:51:21.000000000 +0100 ++++ linux-2.6.32/arch/mips/rb532/devices.c 2010-02-01 22:29:05.000000000 +0100 +@@ -190,8 +190,12 @@ + }, { + .name = "rootfs", + .offset = MTDPART_OFS_NXTBLK, +- .size = MTDPART_SIZ_FULL, +- } ++ .size = 0x8000000 - 0x400000 - 0x400000, ++ }, { ++ .name = "cfgfs", ++ .offset = 0x8000000 - 0x400000, ++ .size = 0x400000, ++ }, + }; + + static struct platform_device rb532_led = { |