* [U-Boot] [PATCH] kbuild: refactor some makefiles
@ 2014-09-18 6:43 Masahiro Yamada
2014-09-18 9:35 ` Marek Vasut
2014-09-25 14:46 ` [U-Boot] " Tom Rini
0 siblings, 2 replies; 3+ messages in thread
From: Masahiro Yamada @ 2014-09-18 6:43 UTC (permalink / raw)
To: u-boot
[1] Move driver/core/, driver/input/ and drivers/input/ entries
from the top Makefile to drivers/Makefile
[2] Remove the conditional by CONFIG_DM in drivers/core/Makefile
because the whole drivers/core directory is already selected
by CONFIG_DM in the upper level
[3] Likewise for CONFIG_DM_DEMO in drivers/demo/Makefile
[4] Simplify common/Makefile - both CONFIG_DDR_SPD and
CONFIG_SPD_EEPROM are boolean macros so they can directly
select objects
Signed-off-by: Masahiro Yamada <yamada.m@jp.panasonic.com>
---
Makefile | 3 ---
common/Makefile | 9 ++-------
drivers/Makefile | 3 +++
drivers/core/Makefile | 2 +-
drivers/demo/Makefile | 2 +-
5 files changed, 7 insertions(+), 12 deletions(-)
diff --git a/Makefile b/Makefile
index 1fccd0b..6221113 100644
--- a/Makefile
+++ b/Makefile
@@ -613,11 +613,9 @@ libs-y += fs/
libs-y += net/
libs-y += disk/
libs-y += drivers/
-libs-$(CONFIG_DM) += drivers/core/
libs-y += drivers/dma/
libs-y += drivers/gpio/
libs-y += drivers/i2c/
-libs-y += drivers/input/
libs-y += drivers/mmc/
libs-y += drivers/mtd/
libs-$(CONFIG_CMD_NAND) += drivers/mtd/nand/
@@ -649,7 +647,6 @@ libs-$(CONFIG_API) += api/
libs-$(CONFIG_HAS_POST) += post/
libs-y += test/
libs-y += test/dm/
-libs-$(CONFIG_DM_DEMO) += drivers/demo/
ifneq (,$(filter $(SOC), mx25 mx27 mx5 mx6 mx31 mx35 mxs vf610))
libs-y += arch/$(ARCH)/imx-common/
diff --git a/common/Makefile b/common/Makefile
index aca0f7f..e9ca55d 100644
--- a/common/Makefile
+++ b/common/Makefile
@@ -243,13 +243,8 @@ obj-y += cmd_nvedit.o
#environment
obj-y += env_common.o
#others
-ifdef CONFIG_DDR_SPD
-SPD := y
-endif
-ifdef CONFIG_SPD_EEPROM
-SPD := y
-endif
-obj-$(SPD) += ddr_spd.o
+obj-$(CONFIG_DDR_SPD) += ddr_spd.o
+obj-$(CONFIG_SPD_EEPROM) += ddr_spd.o
obj-$(CONFIG_HWCONFIG) += hwconfig.o
obj-$(CONFIG_BOUNCE_BUFFER) += bouncebuf.o
obj-y += console.o
diff --git a/drivers/Makefile b/drivers/Makefile
index b22b109..d8361d9 100644
--- a/drivers/Makefile
+++ b/drivers/Makefile
@@ -1,3 +1,5 @@
+obj-$(CONFIG_DM) += core/
+obj-$(CONFIG_DM_DEMO) += demo/
obj-$(CONFIG_BIOSEMU) += bios_emulator/
obj-y += block/
obj-$(CONFIG_BOOTCOUNT_LIMIT) += bootcount/
@@ -16,3 +18,4 @@ obj-y += watchdog/
obj-$(CONFIG_QE) += qe/
obj-y += memory/
obj-y += pwm/
+obj-y += input/
diff --git a/drivers/core/Makefile b/drivers/core/Makefile
index 90b2a7f..c7905b1 100644
--- a/drivers/core/Makefile
+++ b/drivers/core/Makefile
@@ -4,4 +4,4 @@
# SPDX-License-Identifier: GPL-2.0+
#
-obj-$(CONFIG_DM) := device.o lists.o root.o uclass.o util.o
+obj-y := device.o lists.o root.o uclass.o util.o
diff --git a/drivers/demo/Makefile b/drivers/demo/Makefile
index baaa2ba..171ddf3 100644
--- a/drivers/demo/Makefile
+++ b/drivers/demo/Makefile
@@ -4,6 +4,6 @@
# SPDX-License-Identifier: GPL-2.0+
#
-obj-$(CONFIG_DM_DEMO) += demo-uclass.o demo-pdata.o
+obj-y += demo-uclass.o demo-pdata.o
obj-$(CONFIG_DM_DEMO_SIMPLE) += demo-simple.o
obj-$(CONFIG_DM_DEMO_SHAPE) += demo-shape.o
--
1.9.1
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [U-Boot] [PATCH] kbuild: refactor some makefiles
2014-09-18 6:43 [U-Boot] [PATCH] kbuild: refactor some makefiles Masahiro Yamada
@ 2014-09-18 9:35 ` Marek Vasut
2014-09-25 14:46 ` [U-Boot] " Tom Rini
1 sibling, 0 replies; 3+ messages in thread
From: Marek Vasut @ 2014-09-18 9:35 UTC (permalink / raw)
To: u-boot
On Thursday, September 18, 2014 at 08:43:41 AM, Masahiro Yamada wrote:
> [1] Move driver/core/, driver/input/ and drivers/input/ entries
> from the top Makefile to drivers/Makefile
>
> [2] Remove the conditional by CONFIG_DM in drivers/core/Makefile
> because the whole drivers/core directory is already selected
> by CONFIG_DM in the upper level
>
> [3] Likewise for CONFIG_DM_DEMO in drivers/demo/Makefile
>
> [4] Simplify common/Makefile - both CONFIG_DDR_SPD and
> CONFIG_SPD_EEPROM are boolean macros so they can directly
> select objects
>
> Signed-off-by: Masahiro Yamada <yamada.m@jp.panasonic.com>
> ---
[...]
Acked-by: Marek Vasut <marex@denx.de>
Best regards,
Marek Vasut
^ permalink raw reply [flat|nested] 3+ messages in thread
* [U-Boot] kbuild: refactor some makefiles
2014-09-18 6:43 [U-Boot] [PATCH] kbuild: refactor some makefiles Masahiro Yamada
2014-09-18 9:35 ` Marek Vasut
@ 2014-09-25 14:46 ` Tom Rini
1 sibling, 0 replies; 3+ messages in thread
From: Tom Rini @ 2014-09-25 14:46 UTC (permalink / raw)
To: u-boot
On Thu, Sep 18, 2014 at 03:43:41PM +0900, Masahiro Yamada wrote:
> [1] Move driver/core/, driver/input/ and drivers/input/ entries
> from the top Makefile to drivers/Makefile
>
> [2] Remove the conditional by CONFIG_DM in drivers/core/Makefile
> because the whole drivers/core directory is already selected
> by CONFIG_DM in the upper level
>
> [3] Likewise for CONFIG_DM_DEMO in drivers/demo/Makefile
>
> [4] Simplify common/Makefile - both CONFIG_DDR_SPD and
> CONFIG_SPD_EEPROM are boolean macros so they can directly
> select objects
>
> Signed-off-by: Masahiro Yamada <yamada.m@jp.panasonic.com>
> Acked-by: Marek Vasut <marex@denx.de>
Applied to u-boot/master, thanks!
--
Tom
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 836 bytes
Desc: Digital signature
URL: <http://lists.denx.de/pipermail/u-boot/attachments/20140925/9b7a30f9/attachment.pgp>
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2014-09-25 14:46 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2014-09-18 6:43 [U-Boot] [PATCH] kbuild: refactor some makefiles Masahiro Yamada
2014-09-18 9:35 ` Marek Vasut
2014-09-25 14:46 ` [U-Boot] " Tom Rini
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox