diff mbox

arm: clean up build variables

Message ID 1453326479-19885-1-git-send-email-cardoe@cardoe.com
State New, archived
Headers show

Commit Message

Doug Goldstein Jan. 20, 2016, 9:47 p.m. UTC
This consolidates some of the different variables used for the ARM
builds. This change was prompted by the Kconfig changes but looking back
in time the CONFIG_ARM_{32,64} variables existed before Kconfig so this
should just be a generic cleanup.

Signed-off-by: Doug Goldstein <cardoe@cardoe.com>
---
 xen/arch/arm/Makefile            |  8 ++++----
 xen/arch/arm/Rules.mk            | 18 ++++--------------
 xen/drivers/passthrough/Makefile |  2 +-
 3 files changed, 9 insertions(+), 19 deletions(-)

Comments

Jan Beulich Jan. 21, 2016, 10:56 a.m. UTC | #1
>>> On 20.01.16 at 22:47, <cardoe@cardoe.com> wrote:
> This consolidates some of the different variables used for the ARM
> builds. This change was prompted by the Kconfig changes but looking back
> in time the CONFIG_ARM_{32,64} variables existed before Kconfig so this
> should just be a generic cleanup.
> 
> Signed-off-by: Doug Goldstein <cardoe@cardoe.com>
> ---
>  xen/arch/arm/Makefile            |  8 ++++----
>  xen/arch/arm/Rules.mk            | 18 ++++--------------
>  xen/drivers/passthrough/Makefile |  2 +-
>  3 files changed, 9 insertions(+), 19 deletions(-)

Trivial IOMMU part
Acked-by: Jan Beulich <jbeulich@suse.com>
Ian Campbell Jan. 25, 2016, 11:27 a.m. UTC | #2
On Wed, 2016-01-20 at 15:47 -0600, Doug Goldstein wrote:
> This consolidates some of the different variables used for the ARM
> builds. This change was prompted by the Kconfig changes but looking back
> in time the CONFIG_ARM_{32,64} variables existed before Kconfig so this
> should just be a generic cleanup.
> 
> Signed-off-by: Doug Goldstein <cardoe@cardoe.com>
> ---
>  xen/arch/arm/Makefile            |  8 ++++----
>  xen/arch/arm/Rules.mk            | 18 ++++--------------
>  xen/drivers/passthrough/Makefile |  2 +-
>  3 files changed, 9 insertions(+), 19 deletions(-)
> 
> diff --git a/xen/arch/arm/Makefile b/xen/arch/arm/Makefile
> index 2f050f5..0d11c0f 100644
> --- a/xen/arch/arm/Makefile
> +++ b/xen/arch/arm/Makefile
> @@ -1,7 +1,7 @@
> -subdir-$(arm32) += arm32
> -subdir-$(arm64) += arm64
> +subdir-$(CONFIG_ARM_32) += arm32
> +subdir-$(CONFIG_ARM_64) += arm64
>  subdir-y += platforms
> -subdir-$(arm64) += efi
> +subdir-$(CONFIG_ARM_64) += efi
>  
>  obj-$(EARLY_PRINTK) += early_printk.o
>  obj-y += cpu.o
> @@ -52,7 +52,7 @@ ALL_OBJS := $(TARGET_SUBARCH)/head.o $(ALL_OBJS)
>  
>  $(TARGET): $(TARGET)-syms $(TARGET).axf
>  	$(OBJCOPY) -O binary -S $< $@
> -ifeq (arm64,$(XEN_TARGET_ARCH))
> +ifdef CONFIG_ARM_64

The old way looks to be the prevailing normal form. I don't especially
object to the change but things ought to remain consistent.

For the rest:
    Acked-by: Ian Campbell <    ian.campbell@citrix.com    >

FYI I'm not committing things right now due to network issues between the
machine(s) I use for such things.

Ian.
Doug Goldstein Jan. 27, 2016, 2:30 p.m. UTC | #3
On 1/25/16 5:27 AM, Ian Campbell wrote:
> On Wed, 2016-01-20 at 15:47 -0600, Doug Goldstein wrote:
>> This consolidates some of the different variables used for the ARM
>> builds. This change was prompted by the Kconfig changes but looking back
>> in time the CONFIG_ARM_{32,64} variables existed before Kconfig so this
>> should just be a generic cleanup.
>>
>> Signed-off-by: Doug Goldstein <cardoe@cardoe.com>
>> ---
>>  xen/arch/arm/Makefile            |  8 ++++----
>>  xen/arch/arm/Rules.mk            | 18 ++++--------------
>>  xen/drivers/passthrough/Makefile |  2 +-
>>  3 files changed, 9 insertions(+), 19 deletions(-)
>>
>> diff --git a/xen/arch/arm/Makefile b/xen/arch/arm/Makefile
>> index 2f050f5..0d11c0f 100644
>> --- a/xen/arch/arm/Makefile
>> +++ b/xen/arch/arm/Makefile
>> @@ -1,7 +1,7 @@
>> -subdir-$(arm32) += arm32
>> -subdir-$(arm64) += arm64
>> +subdir-$(CONFIG_ARM_32) += arm32
>> +subdir-$(CONFIG_ARM_64) += arm64
>>  subdir-y += platforms
>> -subdir-$(arm64) += efi
>> +subdir-$(CONFIG_ARM_64) += efi
>>  
>>  obj-$(EARLY_PRINTK) += early_printk.o
>>  obj-y += cpu.o
>> @@ -52,7 +52,7 @@ ALL_OBJS := $(TARGET_SUBARCH)/head.o $(ALL_OBJS)
>>  
>>  $(TARGET): $(TARGET)-syms $(TARGET).axf
>>  	$(OBJCOPY) -O binary -S $< $@
>> -ifeq (arm64,$(XEN_TARGET_ARCH))
>> +ifdef CONFIG_ARM_64
> 
> The old way looks to be the prevailing normal form. I don't especially
> object to the change but things ought to remain consistent.

Which part? Using arm32/arm64? Or having the if blocks rather than
var-$(CONFIG_THING) ?

My goal here is consistency and that was to standardize on the form of
var-$(CONFIG_THING) across the board.

> 
> For the rest:
>     Acked-by: Ian Campbell <    ian.campbell@citrix.com    >
> 
> FYI I'm not committing things right now due to network issues between the
> machine(s) I use for such things.
> 
> Ian.
>
Jan Beulich Jan. 27, 2016, 2:44 p.m. UTC | #4
>>> On 27.01.16 at 15:30, <cardoe@cardoe.com> wrote:
> On 1/25/16 5:27 AM, Ian Campbell wrote:
>> On Wed, 2016-01-20 at 15:47 -0600, Doug Goldstein wrote:
>>> @@ -52,7 +52,7 @@ ALL_OBJS := $(TARGET_SUBARCH)/head.o $(ALL_OBJS)
>>>  
>>>  $(TARGET): $(TARGET)-syms $(TARGET).axf
>>>  	$(OBJCOPY) -O binary -S $< $@
>>> -ifeq (arm64,$(XEN_TARGET_ARCH))
>>> +ifdef CONFIG_ARM_64
>> 
>> The old way looks to be the prevailing normal form. I don't especially
>> object to the change but things ought to remain consistent.
> 
> Which part? Using arm32/arm64? Or having the if blocks rather than
> var-$(CONFIG_THING) ?
> 
> My goal here is consistency and that was to standardize on the form of
> var-$(CONFIG_THING) across the board.

But there's no var-$(CONFIG_THING) in the code above.

Jan
Ian Campbell Jan. 27, 2016, 3:05 p.m. UTC | #5
On Wed, 2016-01-27 at 07:44 -0700, Jan Beulich wrote:
> > > > On 27.01.16 at 15:30, <cardoe@cardoe.com> wrote:
> > On 1/25/16 5:27 AM, Ian Campbell wrote:
> > > On Wed, 2016-01-20 at 15:47 -0600, Doug Goldstein wrote:
> > > > @@ -52,7 +52,7 @@ ALL_OBJS := $(TARGET_SUBARCH)/head.o $(ALL_OBJS)
> > > >  
> > > >  $(TARGET): $(TARGET)-syms $(TARGET).axf
> > > >  	$(OBJCOPY) -O binary -S $< $@
> > > > -ifeq (arm64,$(XEN_TARGET_ARCH))
> > > > +ifdef CONFIG_ARM_64
> > > 
> > > The old way looks to be the prevailing normal form. I don't
> > > especially
> > > object to the change but things ought to remain consistent.
> > 
> > Which part? Using arm32/arm64? Or having the if blocks rather than
> > var-$(CONFIG_THING) ?
> > 
> > My goal here is consistency and that was to standardize on the form of
> > var-$(CONFIG_THING) across the board.
> 
> But there's no var-$(CONFIG_THING) in the code above.

Indeed, I was referring to the change from:

-ifeq (arm64,$(XEN_TARGET_ARCH))

to

+ifdef CONFIG_ARM_64

While:

ifeq ($(CONFIG_ARM_64),y)

is the more prevalent style.

Ian.
Doug Goldstein Jan. 27, 2016, 3:11 p.m. UTC | #6
On 1/27/16 9:05 AM, Ian Campbell wrote:
> On Wed, 2016-01-27 at 07:44 -0700, Jan Beulich wrote:
>>>>> On 27.01.16 at 15:30, <cardoe@cardoe.com> wrote:
>>> On 1/25/16 5:27 AM, Ian Campbell wrote:
>>>> On Wed, 2016-01-20 at 15:47 -0600, Doug Goldstein wrote:
>>>>> @@ -52,7 +52,7 @@ ALL_OBJS := $(TARGET_SUBARCH)/head.o $(ALL_OBJS)
>>>>>  
>>>>>  $(TARGET): $(TARGET)-syms $(TARGET).axf
>>>>>  	$(OBJCOPY) -O binary -S $< $@
>>>>> -ifeq (arm64,$(XEN_TARGET_ARCH))
>>>>> +ifdef CONFIG_ARM_64
>>>>
>>>> The old way looks to be the prevailing normal form. I don't
>>>> especially
>>>> object to the change but things ought to remain consistent.
>>>
>>> Which part? Using arm32/arm64? Or having the if blocks rather than
>>> var-$(CONFIG_THING) ?
>>>
>>> My goal here is consistency and that was to standardize on the form of
>>> var-$(CONFIG_THING) across the board.
>>
>> But there's no var-$(CONFIG_THING) in the code above.
> 
> Indeed, I was referring to the change from:
> 
> -ifeq (arm64,$(XEN_TARGET_ARCH))
> 
> to
> 
> +ifdef CONFIG_ARM_64
> 
> While:
> 
> ifeq ($(CONFIG_ARM_64),y)
> 
> is the more prevalent style.
> 
> Ian.
> 

Oh sure. We can do that. Would you like me to send a v2 or are you
comfortable squashing that into the patch?
Ian Campbell Jan. 27, 2016, 3:24 p.m. UTC | #7
On Wed, 2016-01-27 at 09:11 -0600, Doug Goldstein wrote:
> On 1/27/16 9:05 AM, Ian Campbell wrote:
> > On Wed, 2016-01-27 at 07:44 -0700, Jan Beulich wrote:
> > > > > > On 27.01.16 at 15:30, <cardoe@cardoe.com> wrote:
> > > > On 1/25/16 5:27 AM, Ian Campbell wrote:
> > > > > On Wed, 2016-01-20 at 15:47 -0600, Doug Goldstein wrote:
> > > > > > @@ -52,7 +52,7 @@ ALL_OBJS := $(TARGET_SUBARCH)/head.o
> > > > > > $(ALL_OBJS)
> > > > > >  
> > > > > >  $(TARGET): $(TARGET)-syms $(TARGET).axf
> > > > > >  	$(OBJCOPY) -O binary -S $< $@
> > > > > > -ifeq (arm64,$(XEN_TARGET_ARCH))
> > > > > > +ifdef CONFIG_ARM_64
> > > > > 
> > > > > The old way looks to be the prevailing normal form. I don't
> > > > > especially
> > > > > object to the change but things ought to remain consistent.
> > > > 
> > > > Which part? Using arm32/arm64? Or having the if blocks rather than
> > > > var-$(CONFIG_THING) ?
> > > > 
> > > > My goal here is consistency and that was to standardize on the form
> > > > of
> > > > var-$(CONFIG_THING) across the board.
> > > 
> > > But there's no var-$(CONFIG_THING) in the code above.
> > 
> > Indeed, I was referring to the change from:
> > 
> > -ifeq (arm64,$(XEN_TARGET_ARCH))
> > 
> > to
> > 
> > +ifdef CONFIG_ARM_64
> > 
> > While:
> > 
> > ifeq ($(CONFIG_ARM_64),y)
> > 
> > is the more prevalent style.
> > 
> > Ian.
> > 
> 
> Oh sure. We can do that. Would you like me to send a v2 or are you
> comfortable squashing that into the patch?

I may as well just do it, thanks.
Doug Goldstein Jan. 27, 2016, 3:26 p.m. UTC | #8
On 1/27/16 9:24 AM, Ian Campbell wrote:
> On Wed, 2016-01-27 at 09:11 -0600, Doug Goldstein wrote:
>> On 1/27/16 9:05 AM, Ian Campbell wrote:
>>> On Wed, 2016-01-27 at 07:44 -0700, Jan Beulich wrote:
>>>>>>> On 27.01.16 at 15:30, <cardoe@cardoe.com> wrote:
>>>>> On 1/25/16 5:27 AM, Ian Campbell wrote:
>>>>>> On Wed, 2016-01-20 at 15:47 -0600, Doug Goldstein wrote:
>>>>>>> @@ -52,7 +52,7 @@ ALL_OBJS := $(TARGET_SUBARCH)/head.o
>>>>>>> $(ALL_OBJS)
>>>>>>>  
>>>>>>>  $(TARGET): $(TARGET)-syms $(TARGET).axf
>>>>>>>  	$(OBJCOPY) -O binary -S $< $@
>>>>>>> -ifeq (arm64,$(XEN_TARGET_ARCH))
>>>>>>> +ifdef CONFIG_ARM_64
>>>>>>
>>>>>> The old way looks to be the prevailing normal form. I don't
>>>>>> especially
>>>>>> object to the change but things ought to remain consistent.
>>>>>
>>>>> Which part? Using arm32/arm64? Or having the if blocks rather than
>>>>> var-$(CONFIG_THING) ?
>>>>>
>>>>> My goal here is consistency and that was to standardize on the form
>>>>> of
>>>>> var-$(CONFIG_THING) across the board.
>>>>
>>>> But there's no var-$(CONFIG_THING) in the code above.
>>>
>>> Indeed, I was referring to the change from:
>>>
>>> -ifeq (arm64,$(XEN_TARGET_ARCH))
>>>
>>> to
>>>
>>> +ifdef CONFIG_ARM_64
>>>
>>> While:
>>>
>>> ifeq ($(CONFIG_ARM_64),y)
>>>
>>> is the more prevalent style.
>>>
>>> Ian.
>>>
>>
>> Oh sure. We can do that. Would you like me to send a v2 or are you
>> comfortable squashing that into the patch?
> 
> I may as well just do it, thanks.
> 
> 

I'll change my style going forward to use that form as well.
Ian Campbell Jan. 29, 2016, 2:35 p.m. UTC | #9
On Wed, 2016-01-27 at 15:24 +0000, Ian Campbell wrote:
> On Wed, 2016-01-27 at 09:11 -0600, Doug Goldstein wrote:
> > On 1/27/16 9:05 AM, Ian Campbell wrote:
> > > Indeed, I was referring to the change from:
> > > 
> > > -ifeq (arm64,$(XEN_TARGET_ARCH))
> > > 
> > > to
> > > 
> > > +ifdef CONFIG_ARM_64
> > > 
> > > While:
> > > 
> > > ifeq ($(CONFIG_ARM_64),y)
> > > 
> > > is the more prevalent style.
> > > 
> > > Ian.
> > > 
> > 
> > Oh sure. We can do that. Would you like me to send a v2 or are you
> > comfortable squashing that into the patch?
> 
> I may as well just do it, thanks.

Pushed with that change, thanks.

Ian.
diff mbox

Patch

diff --git a/xen/arch/arm/Makefile b/xen/arch/arm/Makefile
index 2f050f5..0d11c0f 100644
--- a/xen/arch/arm/Makefile
+++ b/xen/arch/arm/Makefile
@@ -1,7 +1,7 @@ 
-subdir-$(arm32) += arm32
-subdir-$(arm64) += arm64
+subdir-$(CONFIG_ARM_32) += arm32
+subdir-$(CONFIG_ARM_64) += arm64
 subdir-y += platforms
-subdir-$(arm64) += efi
+subdir-$(CONFIG_ARM_64) += efi
 
 obj-$(EARLY_PRINTK) += early_printk.o
 obj-y += cpu.o
@@ -52,7 +52,7 @@  ALL_OBJS := $(TARGET_SUBARCH)/head.o $(ALL_OBJS)
 
 $(TARGET): $(TARGET)-syms $(TARGET).axf
 	$(OBJCOPY) -O binary -S $< $@
-ifeq (arm64,$(XEN_TARGET_ARCH))
+ifdef CONFIG_ARM_64
 	ln -sf $(notdir $@)  ../../$(notdir $@).efi
 endif
 
diff --git a/xen/arch/arm/Rules.mk b/xen/arch/arm/Rules.mk
index 4947e64..0aea282 100644
--- a/xen/arch/arm/Rules.mk
+++ b/xen/arch/arm/Rules.mk
@@ -11,22 +11,12 @@  CFLAGS += -I$(BASEDIR)/include
 $(call cc-options-add,CFLAGS,CC,$(EMBEDDED_EXTRA_CFLAGS))
 $(call cc-option-add,CFLAGS,CC,-Wnested-externs)
 
-arm := y
-
-ifeq ($(TARGET_SUBARCH),arm32)
 # Prevent floating-point variables from creeping into Xen.
-CFLAGS += -msoft-float
-CFLAGS += -mcpu=cortex-a15
-arm32 := y
-arm64 := n
-endif
+CFLAGS-$(CONFIG_ARM_32) += -msoft-float
+CFLAGS-$(CONFIG_ARM_32) += -mcpu=cortex-a15
 
-ifeq ($(TARGET_SUBARCH),arm64)
-CFLAGS += -mcpu=generic
-CFLAGS += -mgeneral-regs-only # No fp registers etc
-arm32 := n
-arm64 := y
-endif
+CFLAGS-$(CONFIG_ARM_64) += -mcpu=generic
+CFLAGS-$(CONFIG_ARM_64) += -mgeneral-regs-only # No fp registers etc
 
 ifneq ($(call cc-option,$(CC),-fvisibility=hidden,n),n)
 CFLAGS += -DGCC_HAS_VISIBILITY_ATTRIBUTE
diff --git a/xen/drivers/passthrough/Makefile b/xen/drivers/passthrough/Makefile
index ca84e36..6087333 100644
--- a/xen/drivers/passthrough/Makefile
+++ b/xen/drivers/passthrough/Makefile
@@ -1,7 +1,7 @@ 
 subdir-$(CONFIG_X86) += vtd
 subdir-$(CONFIG_X86) += amd
 subdir-$(CONFIG_X86) += x86
-subdir-$(arm) += arm
+subdir-$(CONFIG_ARM) += arm
 
 obj-y += iommu.o
 obj-$(CONFIG_X86) += io.o