diff options
| author | Waldemar Brodkorb <wbx@openadk.org> | 2014-04-02 21:04:08 +0200 |
|---|---|---|
| committer | Waldemar Brodkorb <wbx@openadk.org> | 2014-04-02 21:04:08 +0200 |
| commit | fbe5f563db24f5fa7eb24065c89557033a7547a2 (patch) | |
| tree | 1208e624036bd6434dbdf03c06ad03d5c829bcf1 /mk | |
| parent | 830cbab2bf7c28ce2de623fc06350a1030106200 (diff) | |
| parent | cf494122e89c1f3674079ad3de3604f8d8e94b0b (diff) | |
Merge branch 'master' of git+ssh://openadk.org/git/openadk
Diffstat (limited to 'mk')
| -rw-r--r-- | mk/build.mk | 2 | ||||
| -rw-r--r-- | mk/rootfs.mk | 3 |
2 files changed, 1 insertions, 4 deletions
diff --git a/mk/build.mk b/mk/build.mk index 78079bea9..af1313206 100644 --- a/mk/build.mk +++ b/mk/build.mk @@ -471,9 +471,9 @@ bulktoolchain: while read arch; do \ mkdir -p ${TOPDIR}/firmware; \ ( \ - echo === building $$arch $$libc toolchain-$$arch on $$(date); \ tarch=$$(echo $$arch|sed -e "s#sh4.*#sh#" -e "s#el##" -e "s#eb##" -e "s#mips64.*#mips#" -e "s#hf##" -e "s#x86_64.*#x86_64#" ); \ carch=$$(echo $$arch|sed -e "s#hf##" -e "s#mips64n.*#mips64#" -e "s#mips64el.*#mips64el#" -e 's#x86$$#i686#' -e "s#x86_64.*#x86_64#" ); \ + echo === building $$tarch $$libc toolchain-$$arch on $$(date); \ $(GMAKE) prereq && \ $(GMAKE) ARCH=$$tarch SYSTEM=toolchain-$$arch LIBC=$$libc defconfig; \ tabi=$$(grep ^ADK_TARGET_ABI= .config|cut -d \" -f 2);\ diff --git a/mk/rootfs.mk b/mk/rootfs.mk index 3956306e9..dae0e5805 100644 --- a/mk/rootfs.mk +++ b/mk/rootfs.mk @@ -42,9 +42,6 @@ else USB:= rootdelay=2 endif -$(eval $(call rootfs_template,genext2fs,GENEXT2FS,$(ROOTFS))) -$(eval $(call rootfs_template,cf,CF,$(ROOTFS))) -$(eval $(call rootfs_template,mmc,MMC,$(ROOTFS))) $(eval $(call rootfs_template,usb,USB,$(USB))) $(eval $(call rootfs_template,archive,ARCHIVE,$(ROOTFS))) $(eval $(call rootfs_template,initramfsarchive,INITRAMFSARCHIVE)) |