Permalink
Browse files

More fixes, and configure vendor blobs

  • Loading branch information...
1 parent 75d0e6e commit 92e391b1ce27161d79e6601be89028270a65d716 @joneschrisg joneschrisg committed Aug 5, 2011
Showing with 24 additions and 5 deletions.
  1. +1 −0 .gitignore
  2. +3 −0 .gitmodules
  3. +18 −4 Makefile
  4. +1 −1 glue/gonk/cts
  5. +1 −0 glue/gonk/device/sample
View
@@ -1,3 +1,4 @@
*~
glue/gonk/.config
glue/gonk/out
+glue/gonk/vendor
View
@@ -478,3 +478,6 @@
[submodule "glue/gonk/build"]
path = glue/gonk/build
url = git@github.com:cgjones/android-build.git
+[submodule "glue/gonk/device/sample"]
+ path = glue/gonk/device/sample
+ url = git://android.git.kernel.org/device/sample.git
View
@@ -4,10 +4,10 @@ SHELL = bash
.DEFAULT: build
PARALLELISM = 16
-GONK = glue/gonk
+GONK = $(abspath glue/gonk)
define GONK_CMD # $(call GONK_CMD,cmd)
- @cd $(GONK) && \
+ cd $(GONK) && \
. build/envsetup.sh && \
lunch `cat .config` && \
$(1)
@@ -57,19 +57,33 @@ clean-kernel:
config-gecko-gonk:
@cp -p config/gecko-prof-gonk gecko/.mozconfig
+
+define INSTALL_NEXUS_S_BLOB # $(call INSTALL_BLOB,vendor,id)
+ wget https://dl.google.com/dl/android/aosp/$(1)-crespo4g-grj90-$(2).tgz && \
+ tar zxvf $(1)-crespo4g-grj90-$(2).tgz && \
+ ./extract-$(1)-crespo4g.sh && \
+ rm $(1)-crespo4g-grj90-$(2).tgz extract-$(1)-crespo4g.sh
+endef
+
.PHONY: config-nexuss4g
# XXX Hard-coded for nexuss4g target
config-nexuss4g: config-gecko-gonk
@cp -p config/kernel-nexuss4g boot/kernel-android-samsung/.config && \
- echo -n full_crespo4g-eng > $(GONK)/.config
+ cd $(GONK) && \
+ echo -n full_crespo4g-eng > .config && \
+ $(call INSTALL_NEXUS_S_BLOB,broadcom,c4ec9a38) && \
+ $(call INSTALL_NEXUS_S_BLOB,imgtec,a8e2ce86) && \
+ $(call INSTALL_NEXUS_S_BLOB,nxp,9abcae18) && \
+ $(call INSTALL_NEXUS_S_BLOB,samsung,9474e48f) && \
+ $(call GONK_CMD,make signapk && vendor/samsung/crespo4g/reassemble-apks.sh)
.PHONY: flash
# XXX Hard-coded for nexuss4g target
flash: image
@$(call GONK_CMD,adb reboot bootloader && fastboot flashall -w)
.PHONY: bootimg-hack
-bootimg-hack:
+bootimg-hack: kernel
cp boot/kernel-android-samsung/arch/arm/boot/zImage $(GONK)/device/samsung/crespo/kernel
.PHONY: image
Submodule cts updated from fabaa0 to 9093c9
Submodule sample added at 3f6a48

0 comments on commit 92e391b

Please sign in to comment.