Skip to content
Snippets Groups Projects
Commit 046a3b68 authored by Kenneth Johansson's avatar Kenneth Johansson
Browse files

white space change.

emacs higlight tabs in Makefile mode so remove the tabs.
parent 42388e49
No related branches found
No related tags found
No related merge requests found
...@@ -62,15 +62,15 @@ endif ...@@ -62,15 +62,15 @@ endif
define Image/Prepare define Image/Prepare
# Called before any rootfs images are built # Called before any rootfs images are built
echo "In Image/prepare $(1) $(2)" echo "In Image/prepare $(1) $(2)"
# compressed kernel (.w.x.y) # compressed kernel (.w.x.y)
$(STAGING_DIR_HOST)/bin/lzma e -d22 -lp2 -lc1 $(KDIR)/vmlinux.bcm $(KDIR)/vmlinux.lzma $(STAGING_DIR_HOST)/bin/lzma e -d22 -lp2 -lc1 $(KDIR)/vmlinux.bcm $(KDIR)/vmlinux.lzma
$(STAGING_DIR_HOST)/bin/imagetag_nand $(IMAGETAG_KERNEL_ARGS) $(STAGING_DIR_HOST)/bin/imagetag_nand $(IMAGETAG_KERNEL_ARGS)
ifneq ($(CONFIG_TARGET_ROOTFS_UBIFS),) ifneq ($(CONFIG_TARGET_ROOTFS_UBIFS),)
# make kernel jffs2 image (.x.y) # make kernel jffs2 image (.x.y)
mkdir -p $(KDIR)/kernel_fs mkdir -p $(KDIR)/kernel_fs
cp $(KDIR)/vmlinux.lz $(KDIR)/kernel_fs/ cp $(KDIR)/vmlinux.lz $(KDIR)/kernel_fs/
touch $(KDIR)/kernel_fs/cferam.001 touch $(KDIR)/kernel_fs/cferam.001
...@@ -83,43 +83,43 @@ define Image/Prepare ...@@ -83,43 +83,43 @@ define Image/Prepare
-d $(KDIR)/kernel_fs -o $(KDIR)/vmlinux.jffs2 -d $(KDIR)/kernel_fs -o $(KDIR)/vmlinux.jffs2
endif endif
# generate jffs2 eof file marker of 128k size (.w) # generate jffs2 eof file marker of 128k size (.w)
dd if=/dev/zero of=$(KDIR)/file128k.tmp bs=1k count=128 dd if=/dev/zero of=$(KDIR)/file128k.tmp bs=1k count=128
echo -ne '\xde\xad\xc0\xde' > $(KDIR)/jffs2_eof_marker echo -ne '\xde\xad\xc0\xde' > $(KDIR)/jffs2_eof_marker
#generate board tag # generate board tag
cat $(KDIR)/jffs2_eof_marker $(KDIR)/file128k.tmp | head --bytes=1024 > $(KDIR)/jffs2_eof_marker_1024 cat $(KDIR)/jffs2_eof_marker $(KDIR)/file128k.tmp | head --bytes=1024 > $(KDIR)/jffs2_eof_marker_1024
echo -ne $(CONFIG_TARGET_MODEL_NAME) >>$(KDIR)/jffs2_eof_marker_1024 echo -ne $(CONFIG_TARGET_MODEL_NAME) >>$(KDIR)/jffs2_eof_marker_1024
cat $(KDIR)/jffs2_eof_marker_1024 $(KDIR)/file128k.tmp | head --bytes=2048 > $(KDIR)/jffs2_eof_marker_2048 cat $(KDIR)/jffs2_eof_marker_1024 $(KDIR)/file128k.tmp | head --bytes=2048 > $(KDIR)/jffs2_eof_marker_2048
#generate customer tag # generate customer tag
echo -ne $(CONFIG_TARGET_CUSTOMER) >>$(KDIR)/jffs2_eof_marker_2048 echo -ne $(CONFIG_TARGET_CUSTOMER) >>$(KDIR)/jffs2_eof_marker_2048
cat $(KDIR)/jffs2_eof_marker_2048 $(KDIR)/file128k.tmp | head --bytes=131072 > $(KDIR)/jffs2_eof_marker_128k cat $(KDIR)/jffs2_eof_marker_2048 $(KDIR)/file128k.tmp | head --bytes=131072 > $(KDIR)/jffs2_eof_marker_128k
# these files need to go in a set of erase blocks of their own to minimize the chance of relocation (.w) # these files need to go in a set of erase blocks of their own to minimize the chance of relocation (.w)
echo "/cferam.001" > $(KDIR)/sortlist echo "/cferam.001" > $(KDIR)/sortlist
echo "/vmlinux.lz" >> $(KDIR)/sortlist echo "/vmlinux.lz" >> $(KDIR)/sortlist
# add the files that should not be compressed (.w) # add the files that should not be compressed (.w)
echo -e "/IOP3" > $(KDIR)/nocomprlist echo -e "/IOP3" > $(KDIR)/nocomprlist
echo -e "/cferam.001" >> $(KDIR)/nocomprlist echo -e "/cferam.001" >> $(KDIR)/nocomprlist
echo -e "/vmlinux.lz" >> $(KDIR)/nocomprlist echo -e "/vmlinux.lz" >> $(KDIR)/nocomprlist
# add "first boot" marker (.w.x.y) # add "first boot" marker (.w.x.y)
touch $(TARGET_DIR)/IOP3 touch $(TARGET_DIR)/IOP3
# add kernel and cferam flag (.w) # add kernel and cferam flag (.w)
touch $(TARGET_DIR)/cferam.001 touch $(TARGET_DIR)/cferam.001
cp $(KDIR)/vmlinux.lz $(TARGET_DIR)/ cp $(KDIR)/vmlinux.lz $(TARGET_DIR)/
# add/set version info (.w.x.y) # add/set version info (.w.x.y)
sed -i 's/^IOP Version.*/IOP Version: $(IHGSP_BUILD_VERSION)/gi' $(BUILD_DIR_ROOT)/etc/banner sed -i 's/^IOP Version.*/IOP Version: $(IHGSP_BUILD_VERSION)/gi' $(BUILD_DIR_ROOT)/etc/banner
sed -i 's/^BrcmRef Base.*/BrcmRef Base: $(BRCMREF_STR)/gi' $(BUILD_DIR_ROOT)/etc/banner sed -i 's/^BrcmRef Base.*/BrcmRef Base: $(BRCMREF_STR)/gi' $(BUILD_DIR_ROOT)/etc/banner
#sed -i '7iIOP Version: $(IHGSP_BUILD_VERSION)' $(BUILD_DIR_ROOT)/etc/banner # sed -i '7iIOP Version: $(IHGSP_BUILD_VERSION)' $(BUILD_DIR_ROOT)/etc/banner
mkdir -p $(BUILD_DIR_ROOT)/lib/db/version mkdir -p $(BUILD_DIR_ROOT)/lib/db/version
echo $(IHGSP_BUILD_VERSION) > $(BUILD_DIR_ROOT)/lib/db/version/iop_version echo $(IHGSP_BUILD_VERSION) > $(BUILD_DIR_ROOT)/lib/db/version/iop_version
# echo $(CONFIG_TARGET_IBOARDID)> $(BUILD_DIR_ROOT)/lib/db/version/iop_iboardid # echo $(CONFIG_TARGET_IBOARDID)> $(BUILD_DIR_ROOT)/lib/db/version/iop_iboardid
echo $(CONFIG_TARGET_CUSTOMER)> $(BUILD_DIR_ROOT)/lib/db/version/iop_customer echo $(CONFIG_TARGET_CUSTOMER)> $(BUILD_DIR_ROOT)/lib/db/version/iop_customer
# strip out unneeded files (.w.x.y) # strip out unneeded files (.w.x.y)
rm -rf $(BUILD_DIR_ROOT)/lib/modules/3.4.11 rm -rf $(BUILD_DIR_ROOT)/lib/modules/3.4.11
rm -rf $(BUILD_DIR_ROOT)/usr/lib/libvorbisenc* rm -rf $(BUILD_DIR_ROOT)/usr/lib/libvorbisenc*
...@@ -161,8 +161,8 @@ define Image/Prepare ...@@ -161,8 +161,8 @@ define Image/Prepare
endef endef
define Image/Build/Header define Image/Build/Header
# Args: $1=header $2=cfe $3=kernel $4=ubifs # Args: $1=header $2=cfe $3=kernel $4=ubifs
# Any unused arguments should be passed as 'void' # Any unused arguments should be passed as 'void'
echo "In Image/Build/Header $(1) $(2) $(3) $(4)" echo "In Image/Build/Header $(1) $(2) $(3) $(4)"
...@@ -183,22 +183,22 @@ define Image/Build/CFE ...@@ -183,22 +183,22 @@ define Image/Build/CFE
echo "In Image/Build/CFE $(1) $(2)" echo "In Image/Build/CFE $(1) $(2)"
# Tag the (old style) cfe image # Tag the (old style) cfe image
$(STAGING_DIR_HOST)/bin/imagetag_nand -f $(KDIR)/cfe$(CONFIG_BCM_CHIP_ID)_nand.v \ $(STAGING_DIR_HOST)/bin/imagetag_nand -f $(KDIR)/cfe$(CONFIG_BCM_CHIP_ID)_nand.v \
-o $(BIN_DIR)/$(IHGSP_BUILD_VERSION)_cfe \ -o $(BIN_DIR)/$(IHGSP_BUILD_VERSION)_cfe \
$(IMAGETAG_IMAGE_ARGS) $(IMAGETAG_IMAGE_ARGS)
ifeq (1,0) ifeq (1,0)
ifneq ($(CONFIG_TARGET_ROOTFS_UBIFS),) ifneq ($(CONFIG_TARGET_ROOTFS_UBIFS),)
# Make header (.z) # Make header (.z)
$(call Image/Build/Header,header.z,cfe$(CONFIG_BCM_CHIP_ID)_nand.v,void,void) $(call Image/Build/Header,header.z,cfe$(CONFIG_BCM_CHIP_ID)_nand.v,void,void)
# Concat header and cfe together (.z) # Concat header and cfe together (.z)
cat $(KDIR)/header.z \ cat $(KDIR)/header.z \
$(KDIR)/cfe$(CONFIG_BCM_CHIP_ID)_nand.v \ $(KDIR)/cfe$(CONFIG_BCM_CHIP_ID)_nand.v \
> $(BIN_DIR)/$(IHGSP_BUILD_VERSION).z > $(BIN_DIR)/$(IHGSP_BUILD_VERSION).z
# Attach checksum to combined image (.z) # Attach checksum to combined image (.z)
md5sum $(BIN_DIR)/$(IHGSP_BUILD_VERSION).z |awk '{printf "%s",$$$$1}' \ md5sum $(BIN_DIR)/$(IHGSP_BUILD_VERSION).z |awk '{printf "%s",$$$$1}' \
>> $(BIN_DIR)/$(IHGSP_BUILD_VERSION).z >> $(BIN_DIR)/$(IHGSP_BUILD_VERSION).z
endif endif
...@@ -211,45 +211,45 @@ define Image/Build/jffs2-128k ...@@ -211,45 +211,45 @@ define Image/Build/jffs2-128k
echo "In Image/Build/jffs2-128k $(1) $(2)" echo "In Image/Build/jffs2-128k $(1) $(2)"
#add jffs2 eof marker # add jffs2 eof marker
cat $(KDIR)/jffs2_eof_marker_128k >> $(KDIR)/root.$(1) cat $(KDIR)/jffs2_eof_marker_128k >> $(KDIR)/root.$(1)
# Tag the rootfs image # Tag the rootfs image
$(STAGING_DIR_HOST)/bin/imagetag_nand -f $(KDIR)/root.$(1) \ $(STAGING_DIR_HOST)/bin/imagetag_nand -f $(KDIR)/root.$(1) \
-o $(BIN_DIR)/$(IHGSP_BUILD_VERSION)_fs_image \ -o $(BIN_DIR)/$(IHGSP_BUILD_VERSION)_fs_image \
$(IMAGETAG_IMAGE_ARGS) $(IMAGETAG_IMAGE_ARGS)
# Concat the cfe and rootfs together (.w) # Concat the cfe and rootfs together (.w)
cat $(BIN_DIR)/$(IHGSP_BUILD_VERSION)_cfe \ cat $(BIN_DIR)/$(IHGSP_BUILD_VERSION)_cfe \
$(KDIR)/root.$(1) > $(KDIR)/cfe_fs_image_128 $(KDIR)/root.$(1) > $(KDIR)/cfe_fs_image_128
# Tag the combined image (.w) # Tag the combined image (.w)
$(STAGING_DIR_HOST)/bin/imagetag_nand -f $(KDIR)/cfe_fs_image_128 \ $(STAGING_DIR_HOST)/bin/imagetag_nand -f $(KDIR)/cfe_fs_image_128 \
-o $(BIN_DIR)/$(IHGSP_BUILD_VERSION).w \ -o $(BIN_DIR)/$(IHGSP_BUILD_VERSION).w \
$(IMAGETAG_IMAGE_ARGS) $(IMAGETAG_IMAGE_ARGS)
# DIRTY! DIRTY! DIRTY! DIRTY! DIRTY! DIRTY! DIRTY! # DIRTY! DIRTY! DIRTY! DIRTY! DIRTY! DIRTY! DIRTY!
# kernel and cferam flag not needed in UBI file systems! # kernel and cferam flag not needed in UBI file systems!
# Take these away in "prepare" when we no longer build JFFS2 rootfs. # Take these away in "prepare" when we no longer build JFFS2 rootfs.
rm $(TARGET_DIR)/cferam.001 rm $(TARGET_DIR)/cferam.001
rm $(TARGET_DIR)/vmlinux.lz rm $(TARGET_DIR)/vmlinux.lz
endef endef
define Image/Build/ubi define Image/Build/ubi
# This function will only be called if CONFIG_TARGET_ROOTFS_UBIFS = y # This function will only be called if CONFIG_TARGET_ROOTFS_UBIFS = y
echo "In Image/Build/ubi $(1) $(2)" echo "In Image/Build/ubi $(1) $(2)"
cat /dev/zero | tr "\000" "\377" \ cat /dev/zero | tr "\000" "\377" \
| head --bytes=$$$$((84*131072)) > $(KDIR)/lotsof.ff | head --bytes=$$$$((84*131072)) > $(KDIR)/lotsof.ff
# make nvram2 image (.x) # make nvram2 image (.x)
echo 'NVRAM' > $(KDIR)/nvram_marker echo 'NVRAM' > $(KDIR)/nvram_marker
cat $(KDIR)/nvram_marker $(KDIR)/lotsof.ff \ cat $(KDIR)/nvram_marker $(KDIR)/lotsof.ff \
| head --bytes=131072 > $(KDIR)/nvram.bin | head --bytes=131072 > $(KDIR)/nvram.bin
ifeq (1,0) ifeq (1,0)
# Concat cfe, nvram, vmlinux and ubi images together (.x) # Concat cfe, nvram, vmlinux and ubi images together (.x)
cat $(BIN_DIR)/$(IHGSP_BUILD_VERSION)_cfe \ cat $(BIN_DIR)/$(IHGSP_BUILD_VERSION)_cfe \
$(KDIR)/nvram.bin \ $(KDIR)/nvram.bin \
$(KDIR)/nvram.bin \ $(KDIR)/nvram.bin \
...@@ -262,7 +262,7 @@ define Image/Build/ubi ...@@ -262,7 +262,7 @@ define Image/Build/ubi
rm $(KDIR)/temp_x.img rm $(KDIR)/temp_x.img
# Tag the combined image (.x) # Tag the combined image (.x)
$(STAGING_DIR_HOST)/bin/imagetag_nand \ $(STAGING_DIR_HOST)/bin/imagetag_nand \
-f $(KDIR)/cfe_nvram_vmlinux_ubi_image_128 \ -f $(KDIR)/cfe_nvram_vmlinux_ubi_image_128 \
-o $(BIN_DIR)/$(IHGSP_BUILD_VERSION).x \ -o $(BIN_DIR)/$(IHGSP_BUILD_VERSION).x \
...@@ -271,24 +271,24 @@ define Image/Build/ubi ...@@ -271,24 +271,24 @@ define Image/Build/ubi
rm $(KDIR)/lotsof.ff rm $(KDIR)/lotsof.ff
# Make header (.y) # Make header (.y)
$(call Image/Build/Header,header.y,cfe$(CONFIG_BCM_CHIP_ID)_nand.v,vmlinux.jffs2,root.ubifs) $(call Image/Build/Header,header.y,cfe$(CONFIG_BCM_CHIP_ID)_nand.v,vmlinux.jffs2,root.ubifs)
# Concat header, cfe, vmlinux and ubifs together (.y) # Concat header, cfe, vmlinux and ubifs together (.y)
cat $(KDIR)/header.y \ cat $(KDIR)/header.y \
$(KDIR)/cfe$(CONFIG_BCM_CHIP_ID)_nand.v \ $(KDIR)/cfe$(CONFIG_BCM_CHIP_ID)_nand.v \
$(KDIR)/vmlinux.jffs2 \ $(KDIR)/vmlinux.jffs2 \
$(KDIR)/root.ubifs > $(BIN_DIR)/$(IHGSP_BUILD_VERSION).y $(KDIR)/root.ubifs > $(BIN_DIR)/$(IHGSP_BUILD_VERSION).y
# Attach checksum to combined image (.y) # Attach checksum to combined image (.y)
md5sum $(BIN_DIR)/$(IHGSP_BUILD_VERSION).y |awk '{printf "%s",$$$$1}' \ md5sum $(BIN_DIR)/$(IHGSP_BUILD_VERSION).y |awk '{printf "%s",$$$$1}' \
>> $(BIN_DIR)/$(IHGSP_BUILD_VERSION).y >> $(BIN_DIR)/$(IHGSP_BUILD_VERSION).y
endef endef
define Image/Build define Image/Build
# Called at the end of Image/mkfs/{jffs2,squashfs,ubifs} depending on # Called at the end of Image/mkfs/{jffs2,squashfs,ubifs} depending on
# which CONFIG_TARGET_ROOTFS_* are enabled in the configuration. # which CONFIG_TARGET_ROOTFS_* are enabled in the configuration.
echo "In Image/Build $(1) $(2)" echo "In Image/Build $(1) $(2)"
$(if $(CFE_BUILT),,$(call Image/Build/CFE)) $(if $(CFE_BUILT),,$(call Image/Build/CFE))
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment