@@ -135,37 +135,7 @@ config BR2_TARGET_UBOOT_FORMAT_CUSTOM_NAME
U-Boot, if it is not one of the default names. For example:
u-boot_magic.bin
-config BR2_TARGET_UBOOT_OMAP_IFT
- depends on BR2_TARGET_UBOOT_FORMAT_BIN
- depends on BR2_arm || BR2_armeb
- select BR2_PACKAGE_HOST_OMAP_U_BOOT_UTILS
- bool "produce a .ift signed image (OMAP)"
- help
- Use gpsign to produce an image of u-boot.bin signed with
- a Configuration Header for booting on OMAP processors.
- This allows U-Boot to boot without the need for an
- intermediate bootloader (e.g. x-loader) if it is written
- on the first sector of the boot medium.
- This only works for some media, such as NAND. Check your
- chip documentation for details. You might also want to
- read the documentation of gpsign, the tool that generates
- the .ift image, at:
- https://github.com/nmenon/omap-u-boot-utils/blob/master/README
-
-if BR2_TARGET_UBOOT_OMAP_IFT
-
-config BR2_TARGET_UBOOT_OMAP_IFT_CONFIG
- string "gpsign Configuration Header config file"
- help
- The Configuration Header (CH) config file defines the
- desired content of the CH for the signed image.
- It usually contains external RAM settings and
- possibly other external devices initialization.
- The omap-u-boot-utils software contains example
- configuration files for some boards:
- https://github.com/nmenon/omap-u-boot-utils/tree/master/configs
-
-endif
+source "boot/uboot/Config.in.arm-omap"
menuconfig BR2_TARGET_UBOOT_NETWORK
bool "Custom Network Settings"
new file mode 100644
@@ -0,0 +1,31 @@
+config BR2_TARGET_UBOOT_OMAP_IFT
+ depends on BR2_TARGET_UBOOT_FORMAT_BIN
+ depends on BR2_arm || BR2_armeb
+ select BR2_PACKAGE_HOST_OMAP_U_BOOT_UTILS
+ bool "produce a .ift signed image (OMAP)"
+ help
+ Use gpsign to produce an image of u-boot.bin signed with
+ a Configuration Header for booting on OMAP processors.
+ This allows U-Boot to boot without the need for an
+ intermediate bootloader (e.g. x-loader) if it is written
+ on the first sector of the boot medium.
+ This only works for some media, such as NAND. Check your
+ chip documentation for details. You might also want to
+ read the documentation of gpsign, the tool that generates
+ the .ift image, at:
+ https://github.com/nmenon/omap-u-boot-utils/blob/master/README
+
+if BR2_TARGET_UBOOT_OMAP_IFT
+
+config BR2_TARGET_UBOOT_OMAP_IFT_CONFIG
+ string "gpsign Configuration Header config file"
+ help
+ The Configuration Header (CH) config file defines the
+ desired content of the CH for the signed image.
+ It usually contains external RAM settings and
+ possibly other external devices initialization.
+ The omap-u-boot-utils software contains example
+ configuration files for some boards:
+ https://github.com/nmenon/omap-u-boot-utils/tree/master/configs
+
+endif
@@ -119,11 +119,6 @@ define UBOOT_BUILD_CMDS
$(UBOOT_MAKE_TARGET)
endef
-define UBOOT_BUILD_OMAP_IFT
- $(HOST_DIR)/usr/bin/gpsign -f $(@D)/u-boot.bin \
- -c $(call qstrip,$(BR2_TARGET_UBOOT_OMAP_IFT_CONFIG))
-endef
-
define UBOOT_INSTALL_IMAGES_CMDS
cp -dpf $(@D)/$(UBOOT_BIN) $(BINARIES_DIR)/
$(if $(BR2_TARGET_UBOOT_SPL),
@@ -134,25 +129,6 @@ define UBOOT_INSTALL_IMAGES_CMDS
-o $(BINARIES_DIR)/uboot-env.bin $(BR2_TARGET_UBOOT_ENVIMAGE_SOURCE))
endef
-define UBOOT_INSTALL_OMAP_IFT_IMAGE
- cp -dpf $(@D)/$(UBOOT_BIN_IFT) $(BINARIES_DIR)/
-endef
-
-ifeq ($(BR2_TARGET_UBOOT_OMAP_IFT),y)
-# we NEED a config file unless we're at make source
-ifeq ($(filter source,$(MAKECMDGOALS)),)
-ifeq ($(call qstrip,$(BR2_TARGET_UBOOT_OMAP_IFT_CONFIG)),)
-$(error No gpsign config file. Check your BR2_TARGET_UBOOT_OMAP_IFT_CONFIG setting)
-endif
-ifeq ($(wildcard $(call qstrip,$(BR2_TARGET_UBOOT_OMAP_IFT_CONFIG))),)
-$(error gpsign config file $(BR2_TARGET_UBOOT_OMAP_IFT_CONFIG) not found. Check your BR2_TARGET_UBOOT_OMAP_IFT_CONFIG setting)
-endif
-endif
-UBOOT_DEPENDENCIES += host-omap-u-boot-utils
-UBOOT_POST_BUILD_HOOKS += UBOOT_BUILD_OMAP_IFT
-UBOOT_POST_INSTALL_IMAGES_HOOKS += UBOOT_INSTALL_OMAP_IFT_IMAGE
-endif
-
ifeq ($(BR2_TARGET_UBOOT_ENVIMAGE),y)
# we NEED a environment settings unless we're at make source
ifeq ($(filter source,$(MAKECMDGOALS)),)
@@ -166,6 +142,8 @@ endif
UBOOT_DEPENDENCIES += host-uboot-tools
endif
+include $(sort $(wildcard boot/uboot/uboot.mk.*))
+
$(eval $(generic-package))
ifeq ($(BR2_TARGET_UBOOT),y)
new file mode 100644
@@ -0,0 +1,29 @@
+################################################################################
+#
+# uboot-arm-omap
+#
+################################################################################
+
+define UBOOT_BUILD_OMAP_IFT
+ $(HOST_DIR)/usr/bin/gpsign -f $(@D)/u-boot.bin \
+ -c $(call qstrip,$(BR2_TARGET_UBOOT_OMAP_IFT_CONFIG))
+endef
+
+define UBOOT_INSTALL_OMAP_IFT_IMAGE
+ cp -dpf $(@D)/$(UBOOT_BIN_IFT) $(BINARIES_DIR)/
+endef
+
+ifeq ($(BR2_TARGET_UBOOT_OMAP_IFT),y)
+# we NEED a config file unless we're at make source
+ifeq ($(filter source,$(MAKECMDGOALS)),)
+ifeq ($(call qstrip,$(BR2_TARGET_UBOOT_OMAP_IFT_CONFIG)),)
+$(error No gpsign config file. Check your BR2_TARGET_UBOOT_OMAP_IFT_CONFIG setting)
+endif
+ifeq ($(wildcard $(call qstrip,$(BR2_TARGET_UBOOT_OMAP_IFT_CONFIG))),)
+$(error gpsign config file $(BR2_TARGET_UBOOT_OMAP_IFT_CONFIG) not found. Check your BR2_TARGET_UBOOT_OMAP_IFT_CONFIG setting)
+endif
+endif
+UBOOT_DEPENDENCIES += host-omap-u-boot-utils
+UBOOT_POST_BUILD_HOOKS += UBOOT_BUILD_OMAP_IFT
+UBOOT_POST_INSTALL_IMAGES_HOOKS += UBOOT_INSTALL_OMAP_IFT_IMAGE
+endif