diff options
| author | Doug Zongker <dougz@android.com> | 2009-06-19 17:12:18 -0700 |
|---|---|---|
| committer | Doug Zongker <dougz@android.com> | 2009-06-22 17:46:19 -0700 |
| commit | e01100c7ac15bd884ca02c64f42b908b93e37c26 (patch) | |
| tree | fdae9f670bcff3d07b2fb0bfac9e572d0b0c1a73 /target | |
| parent | 05d3dea519688b61d86e30c2d4b99ff494aeca73 (diff) | |
| download | build-e01100c7ac15bd884ca02c64f42b908b93e37c26.zip build-e01100c7ac15bd884ca02c64f42b908b93e37c26.tar.gz build-e01100c7ac15bd884ca02c64f42b908b93e37c26.tar.bz2 | |
generalize the definition of a "radio image"
Non-HTC devices may have multiple files constituting their "radio
image". Generalize the INSTALLED_RADIOIMAGE_TARGET variable a bit:
initially define it as empty, then let AndroidBoard.mk files add to
it. Provide a convenience function add-radio-image for them to call
to add files. Put all those files into the target_files zip for use
in OTA and fastboot package construction.
Note that for HTC devices, this changes the name of the radio image in
the target_files zip: instead of "RADIO/image" it will be
"RADIO/radio.img". Tools that use the target_files zip will need to
be changed.
Diffstat (limited to 'target')
| -rw-r--r-- | target/board/Android.mk | 7 | ||||
| -rw-r--r-- | target/board/generic/BoardConfig.mk | 3 |
2 files changed, 3 insertions, 7 deletions
diff --git a/target/board/Android.mk b/target/board/Android.mk index 64e3a74..fc2f651 100644 --- a/target/board/Android.mk +++ b/target/board/Android.mk @@ -20,11 +20,8 @@ else INSTALLED_KERNEL_TARGET := endif -ifneq ($(strip $(TARGET_NO_RADIOIMAGE)),true) - INSTALLED_RADIOIMAGE_TARGET := $(PRODUCT_OUT)/radio.img -else - INSTALLED_RADIOIMAGE_TARGET := -endif +# Use the add-radio-file function to add values to this variable. +INSTALLED_RADIOIMAGE_TARGET := ifeq (,$(wildcard $(TARGET_DEVICE_DIR)/AndroidBoard.mk)) ifeq (,$(wildcard $(TARGET_DEVICE_DIR)/Android.mk)) diff --git a/target/board/generic/BoardConfig.mk b/target/board/generic/BoardConfig.mk index 6ec2de3..2b72d01 100644 --- a/target/board/generic/BoardConfig.mk +++ b/target/board/generic/BoardConfig.mk @@ -1,12 +1,11 @@ # config.mk -# +# # Product-specific compile-time definitions. # # The generic product target doesn't have any hardware-specific pieces. TARGET_NO_BOOTLOADER := true TARGET_NO_KERNEL := true -TARGET_NO_RADIOIMAGE := true TARGET_CPU_ABI := armeabi HAVE_HTC_AUDIO_DRIVER := true BOARD_USES_GENERIC_AUDIO := true |