Fixup device table location

This commit is contained in:
Eric Andersen 2005-03-09 17:30:20 +00:00
parent 318cae634d
commit d93b209d35
2 changed files with 14 additions and 18 deletions

View File

@ -39,11 +39,6 @@ config BR2_TARGET_ROOTFS_JFFS2_SQUASH
bool "Make all files be owned by root" bool "Make all files be owned by root"
depends on BR2_TARGET_ROOTFS_JFFS2 depends on BR2_TARGET_ROOTFS_JFFS2
config BR2_TARGET_ROOTFS_JFFS2_DEVFILE
string "Location of device table file"
depends on BR2_TARGET_ROOTFS_JFFS2
default "target/default/device_table.txt"
config BR2_TARGET_ROOTFS_JFFS2_OUTPUT config BR2_TARGET_ROOTFS_JFFS2_OUTPUT
string "Output File" string "Output File"
depends on BR2_TARGET_ROOTFS_JFFS2 depends on BR2_TARGET_ROOTFS_JFFS2

View File

@ -27,7 +27,7 @@ endif
JFFS2_DEVFILE = $(strip $(subst ",,$(BR2_TARGET_ROOTFS_JFFS2_DEVFILE))) JFFS2_DEVFILE = $(strip $(subst ",,$(BR2_TARGET_ROOTFS_JFFS2_DEVFILE)))
ifneq ($(JFFS2_DEVFILE),) ifneq ($(JFFS2_DEVFILE),)
JFFS2_OPTS += -D $(JFFS2_DEVFILE) JFFS2_OPTS += -D $(TARGET_DEVICE_TABLE)
endif endif
JFFS2_TARGET := $(subst ",,$(BR2_TARGET_ROOTFS_JFFS2_OUTPUT)) JFFS2_TARGET := $(subst ",,$(BR2_TARGET_ROOTFS_JFFS2_OUTPUT))
@ -47,6 +47,7 @@ $(JFFS2_TARGET): mtd-host
$(JFFS2_OPTS) \ $(JFFS2_OPTS) \
-d $(BUILD_DIR)/root \ -d $(BUILD_DIR)/root \
-o $(JFFS2_TARGET) -o $(JFFS2_TARGET)
-D $(TARGET_DEVICE_TABLE)
@ls -l $(JFFS2_TARGET) @ls -l $(JFFS2_TARGET)
JFFS2_COPYTO := $(strip $(subst ",,$(BR2_TARGET_ROOTFS_JFFS2_COPYTO))) JFFS2_COPYTO := $(strip $(subst ",,$(BR2_TARGET_ROOTFS_JFFS2_COPYTO)))