diff options
author | Waldemar Brodkorb <wbx@openadk.org> | 2010-02-15 22:30:13 +0100 |
---|---|---|
committer | Waldemar Brodkorb <wbx@openadk.org> | 2010-02-15 22:30:13 +0100 |
commit | c57d0300bd42fabd8eeda2a95b6c3960d6e7ce07 (patch) | |
tree | b53bc538246b5a900300b5c6b5ea740f978196f4 /target/ag241 | |
parent | cf4b3959527339206254b8c8fc44deb391beeb10 (diff) | |
parent | 023560ac69a2ecf5659c668c26c0af6b5612a46b (diff) |
Merge branch 'master' of git+ssh://openadk.org/git/openadk
Conflicts:
package/nspr/Makefile
Diffstat (limited to 'target/ag241')
-rw-r--r-- | target/ag241/Makefile | 6 | ||||
-rw-r--r-- | target/ag241/TODO | 1 | ||||
-rw-r--r-- | target/ag241/kernel.config | 10 |
3 files changed, 7 insertions, 10 deletions
diff --git a/target/ag241/Makefile b/target/ag241/Makefile index f6bba9c85..cb8ce4a71 100644 --- a/target/ag241/Makefile +++ b/target/ag241/Makefile @@ -25,7 +25,7 @@ kernel-install: tools-compile $(LINUX_DIR)/vmlinux.tmp PATH='${TARGET_PATH}' \ addpattern -p AG3B -b -r 2.0 -i $(LINUX_DIR)/vmlinux.tmp \ - -o $(BIN_DIR)/${ADK_TARGET}-${FS}-kernel + -o $(BIN_DIR)/${ADK_TARGET}-${FS}-kernel 2>/dev/null ifeq ($(FS),squashfs) imageinstall: $(BIN_DIR)/$(ROOTFSSQUASHFS) @@ -43,10 +43,10 @@ imageinstall: $(BIN_DIR)/$(ROOTFSSQUASHFS) endif ifeq ($(FS),nfsroot) -imageinstall: $(BIN_DIR)/$(ROOTFSTARBALL) +imageinstall: $(BIN_DIR)/$(ROOTFSUSERTARBALL) @echo @echo 'The kernel file is: ${BIN_DIR}/${ADK_TARGET}-${FS}-kernel' - @echo 'The nfs root tarball is: ${BIN_DIR}/${ROOTFSTARBALL}' + @echo 'The nfs root tarball is: ${BIN_DIR}/${ROOTFSUSERTARBALL}' @echo 'You can flash the kernel via tftp:' @echo 'tftp 192.168.1.1' @echo 'tftp> binary' diff --git a/target/ag241/TODO b/target/ag241/TODO deleted file mode 100644 index 19fd8d5e8..000000000 --- a/target/ag241/TODO +++ /dev/null @@ -1 +0,0 @@ -- update with mtd diff --git a/target/ag241/kernel.config b/target/ag241/kernel.config index e7a5bbfbc..8ab0f9046 100644 --- a/target/ag241/kernel.config +++ b/target/ag241/kernel.config @@ -1,7 +1,7 @@ # # Automatically generated make config: don't edit # Linux kernel version: 2.6.32 -# Tue Dec 15 19:52:06 2009 +# Sun Jan 31 19:36:46 2010 # CONFIG_MIPS=y @@ -398,8 +398,9 @@ CONFIG_CFG80211_DEFAULT_PS_VALUE=0 # Generic Driver Options # CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug" -# CONFIG_DEVTMPFS is not set -CONFIG_STANDALONE=y +CONFIG_DEVTMPFS=y +CONFIG_DEVTMPFS_MOUNT=y +# CONFIG_STANDALONE is not set # CONFIG_PREVENT_FIRMWARE_BUILD is not set # CONFIG_FW_LOADER is not set # CONFIG_SYS_HYPERVISOR is not set @@ -434,9 +435,6 @@ CONFIG_MTD_CFI=y # CONFIG_MTD_JEDECPROBE is not set CONFIG_MTD_GEN_PROBE=y # CONFIG_MTD_CFI_ADV_OPTIONS is not set -# CONFIG_MTD_CFI_NOSWAP is not set -# CONFIG_MTD_CFI_BE_BYTE_SWAP is not set -# CONFIG_MTD_CFI_LE_BYTE_SWAP is not set CONFIG_MTD_MAP_BANK_WIDTH_1=y CONFIG_MTD_MAP_BANK_WIDTH_2=y CONFIG_MTD_MAP_BANK_WIDTH_4=y |