diff options
| author | Sascha Hauer <s.hauer@pengutronix.de> | 2023-03-16 15:12:51 +0100 |
|---|---|---|
| committer | Sascha Hauer <s.hauer@pengutronix.de> | 2023-03-16 15:12:51 +0100 |
| commit | 2d615bd09f629fda06b5c9006106915cd6783bcd (patch) | |
| tree | 2d1782e33b817b5631aa3ac354978240ae29469d /scripts | |
| parent | 363e4d17ef42894dec44c7bbadbcef8fa02735f0 (diff) | |
| parent | 58d7e12a8af61f26e04bb1c5933aa2d457774dcd (diff) | |
| download | barebox-2d615bd09f629fda06b5c9006106915cd6783bcd.tar.gz | |
Merge branch 'for-next/arm' into next
Diffstat (limited to 'scripts')
| -rw-r--r-- | scripts/.gitignore | 1 | ||||
| -rw-r--r-- | scripts/Kconfig | 7 | ||||
| -rw-r--r-- | scripts/Makefile | 3 | ||||
| -rw-r--r-- | scripts/imx/Makefile | 10 | ||||
| -rw-r--r-- | scripts/imx/imx.h | 4 | ||||
| -rw-r--r-- | scripts/zynq_mkimage.c | 2 |
6 files changed, 9 insertions, 18 deletions
diff --git a/scripts/.gitignore b/scripts/.gitignore index f78793eab7..3ca742ac6e 100644 --- a/scripts/.gitignore +++ b/scripts/.gitignore @@ -14,7 +14,6 @@ kwboot-target gen_netx_image omap_signGP mk-omap-image -s5p_cksum mkublheader zynq_mkimage socfpga_mkimage diff --git a/scripts/Kconfig b/scripts/Kconfig index 25d57e4b2a..dcd5f32d1d 100644 --- a/scripts/Kconfig +++ b/scripts/Kconfig @@ -63,13 +63,6 @@ config OMAP_IMAGE help This enables building the image creation tools for TI OMAP SoCs -config S5P_IMAGE - bool "S5P image tool" if COMPILE_HOST_TOOLS - depends on ARCH_S5PCxx || COMPILE_HOST_TOOLS - default y if ARCH_S5PCxx - help - This enables building the image creation tool for S5P SoCs - config DAVINCI_IMAGE bool "Davinci image tool" if COMPILE_HOST_TOOLS depends on ARCH_DAVINCI || COMPILE_HOST_TOOLS diff --git a/scripts/Makefile b/scripts/Makefile index 39d71d4e99..72ad9ad7a6 100644 --- a/scripts/Makefile +++ b/scripts/Makefile @@ -19,9 +19,8 @@ hostprogs-always-$(CONFIG_KALLSYMS) += kallsyms hostprogs-always-$(CONFIG_MIPS) += mips-relocs hostprogs-always-$(CONFIG_MVEBU_HOSTTOOLS) += kwbimage kwboot mvebuimg hostprogs-always-$(CONFIG_OMAP_IMAGE) += omap_signGP mk-omap-image -hostprogs-always-$(CONFIG_S5P_IMAGE) += s5p_cksum hostprogs-always-$(CONFIG_DAVINCI_IMAGE) += mkublheader -HOSTCFLAGS_zynq_mkimage.o = -I$(srctree) -I$(srctree)/arch/arm/mach-zynq/include +HOSTCFLAGS_zynq_mkimage.o = -I$(srctree) -I$(srctree)/include/mach hostprogs-always-$(CONFIG_ZYNQ_MKIMAGE) += zynq_mkimage hostprogs-always-$(CONFIG_SOCFPGA_MKIMAGE) += socfpga_mkimage hostprogs-always-$(CONFIG_MXS_HOSTTOOLS) += mxsimage mxsboot diff --git a/scripts/imx/Makefile b/scripts/imx/Makefile index d62277bb54..dbfa82910a 100644 --- a/scripts/imx/Makefile +++ b/scripts/imx/Makefile @@ -9,11 +9,11 @@ HOSTLDLIBS_imx-usb-loader = `pkg-config --libs libusb-1.0` imx-usb-loader-target-userccflags += `$(CROSS_PKG_CONFIG) --cflags libusb-1.0` imx-usb-loader-target-userldlibs += `$(CROSS_PKG_CONFIG) --libs libusb-1.0` -HOSTCFLAGS_imx.o = -I$(srctree)/arch/arm/mach-imx/include -imx-target-userccflags += -I$(srctree)/arch/arm/mach-imx/include -HOSTCFLAGS_imx-image.o = -I$(srctree) -I$(srctree)/arch/arm/mach-imx/include -HOSTCFLAGS_imx-usb-loader.o += -I$(srctree) -I$(srctree)/arch/arm/mach-imx/include -imx-usb-loader-target-userccflags += -I$(srctree) -I$(srctree)/arch/arm/mach-imx/include +HOSTCFLAGS_imx.o = -I$(srctree)/include/mach +imx-target-userccflags += -I$(srctree)/include/mach +HOSTCFLAGS_imx-image.o = -I$(srctree) -I$(srctree)/include/mach +HOSTCFLAGS_imx-usb-loader.o += -I$(srctree) -I$(srctree)/include/mach +imx-usb-loader-target-userccflags += -I$(srctree) -I$(srctree)/include/mach ifdef CONFIG_ARCH_IMX_IMXIMAGE_SSL_SUPPORT HOSTCFLAGS_imx-image.o += -DIMXIMAGE_SSL_SUPPORT HOSTLDLIBS_imx-image = `pkg-config --libs openssl` diff --git a/scripts/imx/imx.h b/scripts/imx/imx.h index 77dea7c54a..08cdf8321a 100644 --- a/scripts/imx/imx.h +++ b/scripts/imx/imx.h @@ -1,6 +1,6 @@ -#include <mach/imx-header.h> -#include <mach/imx_cpu_types.h> +#include <imx/imx-header.h> +#include <imx/imx_cpu_types.h> static inline int cpu_is_mx8m(const struct config_data *data) { diff --git a/scripts/zynq_mkimage.c b/scripts/zynq_mkimage.c index b611d5c69b..9c1e23ef00 100644 --- a/scripts/zynq_mkimage.c +++ b/scripts/zynq_mkimage.c @@ -5,7 +5,7 @@ #include <errno.h> #include <getopt.h> #include <linux/kernel.h> -#include <mach/zynq-flash-header.h> +#include <zynq/zynq-flash-header.h> #include <malloc.h> #include <stdint.h> #include <stdio.h> |