diff options
| author | Tom Rini <trini@konsulko.com> | 2018-12-05 08:23:38 -0500 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2018-12-12 12:14:22 -0500 |
| commit | 91ff6865629c81b8643b4ef6130e3e2130c60400 (patch) | |
| tree | 000bb0133403698032c8316f4870e8dfc5017940 /scripts/Makefile.spl | |
| parent | b0b1768e1b138204ab07d46cbe7d24d3770f0a12 (diff) | |
| download | u-boot-91ff6865629c81b8643b4ef6130e3e2130c60400.tar.gz u-boot-91ff6865629c81b8643b4ef6130e3e2130c60400.tar.xz u-boot-91ff6865629c81b8643b4ef6130e3e2130c60400.zip | |
blk: Rework guard around part_init call
The function part_init() will only be built when we have both
CONFIG_PARTITIONS and CONFIG_HAVE_BLOCK_DEVICE set. Protect the call to
this function with both of these tests now.
Cc: Simon Glass <sjg@chromium.org>
Cc: Philipp Tomsich <philipp.tomsich@theobroma-systems.com>
Cc: Michal Simek <michal.simek@xilinx.com>
Cc: York Sun <york.sun@nxp.com>
Cc: Prabhakar Kushwaha <prabhakar.kushwaha@nxp.com>
Cc: Mingkai Hu <mingkai.hu@nxp.com>
Cc: Stefan Roese <sr@denx.de>
Cc: Marek Behún <marek.behun@nic.cz>
Cc: Vanessa Maegima <vanessa.maegima@nxp.com>
Cc: Eugen Hristev <eugen.hristev@microchip.com>
Cc: Adam Ford <aford173@gmail.com>
Cc: Jagan Teki <jagan@amarulasolutions.com>
Cc: Tom Warren <twarren@nvidia.com>
Cc: Stephen Warren <swarren@nvidia.com>
Cc: Vitaly Andrianov <vitalya@ti.com>
Signed-off-by: Tom Rini <trini@konsulko.com>
Reviewed-by: Simon Glass <sjg@chromium.org>
Diffstat (limited to 'scripts/Makefile.spl')
| -rw-r--r-- | scripts/Makefile.spl | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/scripts/Makefile.spl b/scripts/Makefile.spl index 22bd8f7c27..2ef19bf005 100644 --- a/scripts/Makefile.spl +++ b/scripts/Makefile.spl @@ -81,9 +81,11 @@ libs-$(CONFIG_TPL_LIBGENERIC_SUPPORT) += lib/ else libs-$(CONFIG_SPL_LIBCOMMON_SUPPORT) += common/ cmd/ env/ libs-$(CONFIG_SPL_LIBGENERIC_SUPPORT) += lib/ +ifdef CONFIG_SPL_FRAMEWORK +libs-$(CONFIG_PARTITIONS) += disk/ +endif endif -libs-$(CONFIG_SPL_LIBDISK_SUPPORT) += disk/ libs-y += drivers/ libs-$(CONFIG_SPL_USB_GADGET_SUPPORT) += drivers/usb/dwc3/ libs-y += dts/ |