Re: [for master] [PATCH 3/3] bt-firmware: Override Makefile to handle UNKNOWN platform

From: Karthik Ramanan <a0393906@ti.com>
To: Denys Dmytriyenko <denys@ti.com>
Cc: meta-arago@arago-project.org
Subject: Re: [for master] [PATCH 3/3] bt-firmware: Override Makefile to handle UNKNOWN platform
Date: Thu, 23 Oct 2014 00:00:03 +0530	[thread overview]
Message-ID: <5447F7AB.6030305@ti.com> (raw)
In-Reply-To: <20141022182607.GR25408@edge>

On 22-Oct-14 11:56 PM, Denys Dmytriyenko wrote:
> On Wed, Oct 22, 2014 at 11:54:29PM +0530, Karthik Ramanan wrote:
>> On 22-Oct-14 11:49 PM, Denys Dmytriyenko wrote:
>>> On Thu, Sep 04, 2014 at 09:04:14PM +0530, Karthik Ramanan wrote:
>>>> * By default the Makefile supports only am335x targets
>>>> * This is required to support dra7xx and other devices
>>>
>>> With the updated recipe from Yaniv for version 3.6.1, do you still need this
>>> patch?
>>
>> Yes, this patch is needed and Yaniv's patch will also be needed.
>> But I guess one of the patch needs to be rebased if the other is merged.
>
> I think #2 from your series is not needed, but #1 and #3 can be rebased,
> right?
>
>

 From #2, only this line would be needed on top of Yaniv's change:
+COMPATIBLE_MACHINE·=·"ti33x|ti43x|omap-a15"


>>>> Signed-off-by: Karthik Ramanan <a0393906@ti.com>
>>>> ---
>>>>   ...-Remove-platform-check-and-install-defaul.patch | 41 ++++++++++++++++++++++
>>>>   .../recipes-bsp/bt-firmware/bt-firmware_git.bb     |  5 +--
>>>>   2 files changed, 44 insertions(+), 2 deletions(-)
>>>>   create mode 100644 meta-arago-extras/recipes-bsp/bt-firmware/bt-firmware/0001-bt-firmware-Remove-platform-check-and-install-defaul.patch
>>>>
>>>> diff --git a/meta-arago-extras/recipes-bsp/bt-firmware/bt-firmware/0001-bt-firmware-Remove-platform-check-and-install-defaul.patch b/meta-arago-extras/recipes-bsp/bt-firmware/bt-firmware/0001-bt-firmware-Remove-platform-check-and-install-defaul.patch
>>>> new file mode 100644
>>>> index 0000000..4ad457e
>>>> --- /dev/null
>>>> +++ b/meta-arago-extras/recipes-bsp/bt-firmware/bt-firmware/0001-bt-firmware-Remove-platform-check-and-install-defaul.patch
>>>> @@ -0,0 +1,41 @@
>>>> +From 40bb43c136ec8001d35f6077e5de5f8ac72f4da0 Mon Sep 17 00:00:00 2001
>>>> +From: Roger Monk <r-monk@ti.com>
>>>> +Date: Thu, 3 Oct 2013 02:59:54 +0100
>>>> +Subject: [PATCH] bt-firmware:  Remove platform check and install default
>>>> + firmware
>>>> +
>>>> +   * For undefined plaforms, install default firmware
>>>> +   * Remove configuration of 'unknown' so that install picks
>>>> +     firmware from root directory (default)
>>>> +
>>>> +Signed-off-by: Roger Monk <r-monk@ti.com>
>>>> +---
>>>> + Makefile |    6 +++---
>>>> + 1 file changed, 3 insertions(+), 3 deletions(-)
>>>> +
>>>> +diff --git a/Makefile b/Makefile
>>>> +index bd94881..ca8280a 100644
>>>> +--- a/Makefile
>>>> ++++ b/Makefile
>>>> +@@ -5,8 +5,8 @@
>>>> + # If KERNEL_DIR is not set then use the default in Rules.make
>>>> + DEST_DIR ?= ${DESTDIR}
>>>> +
>>>> +-PLATFORM ?= "unknown"
>>>> +-MACHINE_NAME ?= "unknown"
>>>> ++#PLATFORM ?= "unknown"
>>>> ++#MACHINE_NAME ?= "unknown"
>>>> +
>>>> + ifeq ($(PLATFORM), am335x-evm)
>>>> +     MACHINE_NAME := am335x
>>>> +@@ -23,6 +23,6 @@ endif
>>>> +
>>>> + install:
>>>> + 	install -d $(DEST_DIR)${BASE_LIB_DIR}/firmware
>>>> +-	cp -f ./${MACHINE_NAME}/* $(DEST_DIR)${BASE_LIB_DIR}/firmware
>>>> ++	cp -f ./${MACHINE_NAME}/*.bts $(DEST_DIR)${BASE_LIB_DIR}/firmware
>>>> +
>>>> +
>>>> +--
>>>> +1.7.9.5
>>>> +
>>>> diff --git a/meta-arago-extras/recipes-bsp/bt-firmware/bt-firmware_git.bb b/meta-arago-extras/recipes-bsp/bt-firmware/bt-firmware_git.bb
>>>> index 780519b..aa99686 100644
>>>> --- a/meta-arago-extras/recipes-bsp/bt-firmware/bt-firmware_git.bb
>>>> +++ b/meta-arago-extras/recipes-bsp/bt-firmware/bt-firmware_git.bb
>>>> @@ -11,13 +11,14 @@ PACKAGE_ARCH = "${MACHINE_ARCH}"
>>>>   RCONFLICTS_${PN} = "linux-firmware-wl12xx"
>>>>   RREPLACES_${PN}  = "linux-firmware-wl12xx"
>>>>
>>>> -PR = "r5+gitr${SRCPV}"
>>>> +PR = "r6+gitr${SRCPV}"
>>>>
>>>>   COMPATIBLE_MACHINE = "ti33x|ti43x|omap-a15"
>>>>
>>>>   SRCREV = "e08f59b41b6145b6baf1cb68bca018233ab5e93a"
>>>>   SRC_URI = "git://github.com/TI-ECS/bt-firmware.git;protocol=git \
>>>> -           file://0001-Makefile-allow-building-within-the-OE.patch"
>>>> +           file://0001-Makefile-allow-building-within-the-OE.patch \
>>>> +           file://0001-bt-firmware-Remove-platform-check-and-install-defaul.patch"
>>>>
>>>>   PLATFORM = "unknown"
>>>>   PLATFORM_ti33x = "am335x-evm"
>>>> --
>>>> 2.0.1
>>>>
>>>> _______________________________________________
>>>> meta-arago mailing list
>>>> meta-arago@arago-project.org
>>>> http://arago-project.org/cgi-bin/mailman/listinfo/meta-arago
>>