@@ -117,6 +117,18 @@ config BR2_TARGET_UBOOT_FORMAT_SB
depends on BR2_arm
bool "u-boot.sb"
+config BR2_TARGET_UBOOT_FORMAT_PBL
+ depends on BR2_powerpc_e500mc
+ bool "u-boot.pbl"
+ help
+ PBL (Pre-Boot Loader) is the first stage bootloader for
+ Freescale QorIQ processors. The u-boot.pbl (RCW+PBI+UBOOT)
+ gives the ability for the PBL to boot from a non-NOR flash
+ configuration.
+
+ Refer to doc/README.pblimage in the u-boot source for
+ more details.
+
config BR2_TARGET_UBOOT_FORMAT_CUSTOM
bool "Custom (specify below)"
help
@@ -136,6 +148,7 @@ config BR2_TARGET_UBOOT_FORMAT_CUSTOM_NAME
u-boot_magic.bin
source "boot/uboot/Config.in.arm-omap"
+source "boot/uboot/Config.in.ppc-freescale"
menuconfig BR2_TARGET_UBOOT_NETWORK
bool "Custom Network Settings"
new file mode 100644
@@ -0,0 +1,100 @@
+config BR2_TARGET_UBOOT_RCW_BIN
+ bool "Generate Freescale RCW Binary"
+ depends on BR2_TARGET_UBOOT_FORMAT_BIN
+ depends on BR2_powerpc_e500mc
+ # Must specify the custom config files to generate a RCW.bin
+ select BR2_TARGET_UBOOT_PBL_CUSTOM
+ help
+ Generate a Reset Configuration Word (RCW) binary file
+ for Freescale's QorIQ series of processors. Check your
+ chips documentation for details.
+
+ The RCW and the Pre-Boot Loader instructions will be
+ generated as a stand-alone binary file - RCW.bin. This
+ format is used for NOR flash booting.
+
+menuconfig BR2_TARGET_UBOOT_PBL_CUSTOM
+ bool "Freescale PBL Custom Configuration"
+ depends on BR2_TARGET_UBOOT_FORMAT_PBL || BR2_TARGET_UBOOT_RCW_BIN
+ help
+ Use custom configuration files to produce an image of
+ u-boot.pbl or PBL.bin for Freescale's QorIQ series of
+ processors that contains the RCW and the Pre-Boot Loader
+ instructions.
+
+ The Freescale QorIQ series of processors can boot directly
+ from eSPI FLASH, SD/MMC and NAND, etc. These SoCs use a
+ Pre-Boot Loader (PBL) to load Reset Configuration Word (RCW)
+ and/or pre-initialization instructions (PBI). In order to
+ boot in a boot configuration other than NOR Flash, a specially
+ packaged u-boot binary file is need - u-boot.pbl. For more
+ details on the PBL, refer to chapter 5 "Pre-Boot Loader" of
+ reference manual for you QorIQ proccesor at:
+
+ http://www.freescale.com/webapp/search/Serp.jsp?Reference+Manuals
+
+if BR2_TARGET_UBOOT_PBL_CUSTOM
+
+choice
+ prompt "Custom PBL Config Input Type"
+ default BR2_TARGET_UBOOT_PBL_CUST_FORMAT_PETOOL
+
+config BR2_TARGET_UBOOT_PBL_CUST_FORMAT_PETOOL
+ bool "Use Freescale PE Tool File Format"
+ help
+ Freescale PBL configuration from an exported file from
+ Freescale's Processor Expert Tool in the 'Hex String'
+ format.
+
+ Please refer to Freescale's documentation on "PBL
+ Configuration Tool User Guide" for using QCS customize
+ the PBL settings:
+
+ http://www.freescale.com/infocenter/topic/qcs/qcspbl.html
+
+ The format that is required for the PBL to exported as
+ is the 'Hex String' which is specified in the Output
+ File Type. Please refer to Appendix B of the PBL
+ Configuration Tool User Guide for more information
+ about this file type.
+
+ http://www.freescale.com/infocenter/topic/qcs_pbl_ug/4402240.html
+
+config BR2_TARGET_UBOOT_PBL_CUST_FORMAT_UBOOT
+ bool "Use U-Boot PBL Config Format"
+ depends on BR2_TARGET_UBOOT_FORMAT_PBL
+ help
+ Freescale PBL configuration done using a rcw.cfg and
+ pbi.cfg files. The format of these files is explained
+ by docs/README.pblimage in the U-Boot source.
+
+endchoice
+
+config BR2_TARGET_UBOOT_PBL_CUSTOM_PE_TOOL_FILE
+ string "Custom PE Tool Hex String File"
+ depends on BR2_TARGET_UBOOT_PBL_CUST_FORMAT_PETOOL
+ help
+ Specify a custom Freescale Processor Expert exported
+ 'Hex String' file type. Please see the Freescale's QorIQ
+ Configuration Suite documentation for more information
+ on how to export this file type.
+
+config BR2_TARGET_UBOOT_PBL_CUSTOM_RCW_FILE
+ string "Custom RCW.cfg File"
+ depends on BR2_TARGET_UBOOT_PBL_CUST_FORMAT_UBOOT
+ help
+ The Reset Configuration Word config file - rcw.cfg
+
+ See docs/README.pblimage for more informatin on the
+ format of this file.
+
+config BR2_TARGET_UBOOT_PBL_CUSTOM_PBI_FILE
+ string "Custom PBI.cfg File"
+ depends on BR2_TARGET_UBOOT_PBL_CUST_FORMAT_UBOOT
+ help
+ The Pre-Boot Loader Instructions config file - pbi.cfg
+
+ See docs/README.pblimage for more informatin on the
+ format of this file.
+
+endif # BR2_TARGET_UBOOT_PBL_CUSTOM
@@ -49,6 +49,9 @@ else ifeq ($(BR2_TARGET_UBOOT_FORMAT_SB),y)
UBOOT_BIN = u-boot.sb
UBOOT_MAKE_TARGET = $(UBOOT_BIN)
UBOOT_DEPENDENCIES += host-elftosb
+else ifeq ($(BR2_TARGET_UBOOT_FORMAT_PBL),y)
+UBOOT_BIN = u-boot.pbl
+UBOOT_MAKE_TARGET = $(UBOOT_BIN)
else ifeq ($(BR2_TARGET_UBOOT_FORMAT_CUSTOM),y)
UBOOT_BIN = $(call qstrip,$(BR2_TARGET_UBOOT_FORMAT_CUSTOM_NAME))
else
new file mode 100644
@@ -0,0 +1,116 @@
+################################################################################
+#
+# uboot-ppc-freescale
+#
+################################################################################
+
+# Handling for the customization of the PBL file format.
+ifeq ($(BR2_TARGET_UBOOT_PBL_CUSTOM),y)
+# qstrip versions of menuconfig options
+UBOOT_CUST_RCW_FILE = $(call qstrip,$(BR2_TARGET_UBOOT_PBL_CUSTOM_RCW_FILE))
+UBOOT_CUST_PBI_FILE = $(call qstrip,$(BR2_TARGET_UBOOT_PBL_CUSTOM_PBI_FILE))
+UBOOT_CUST_PETOOL_FILE = $(call qstrip,$(BR2_TARGET_UBOOT_PBL_CUSTOM_PE_TOOL_FILE))
+
+# Temporary location of the PBL configuration files
+UBOOT_PBLRCW_FILE = $(@D)/rcw.cfg
+UBOOT_PBLPBI_FILE = $(@D)/pbi.cfg
+UBOOT_RCWBIN_FILE = $(@D)/RCW.bin
+
+# Handle custom u-boot pbl config files
+ifeq ($(BR2_TARGET_UBOOT_PBL_CUST_FORMAT_UBOOT),y)
+
+# we NEED config files unless we're at make source
+ifeq ($(filter source,$(MAKECMDGOALS)),)
+ifeq ($(UBOOT_CUST_RCW_FILE),)
+$(error No rcw.cfg config file. Check your BR2_TARGET_UBOOT_PBL_CUSTOM_RCW_FILE setting)
+endif
+ifeq ($(wildcard $(UBOOT_CUST_RCW_FILE)),)
+$(error rcw.cfg config file $(BR2_TARGET_UBOOT_PBL_CUSTOM_RCW_FILE) not found. Check your BR2_TARGET_UBOOT_PBL_CUSTOM_RCW_FILE setting)
+endif
+ifeq ($(UBOOT_CUST_PBI_FILE),)
+$(error No pbi.cfg config file. Check your BR2_TARGET_UBOOT_PBL_CUSTOM_PBI_FILE setting)
+endif
+ifeq ($(wildcard $(UBOOT_CUST_PBI_FILE)),)
+$(error pbi.cfg config file $(BR2_TARGET_UBOOT_PBL_CUSTOM_PBI_FILE) not found. Check your BR2_TARGET_UBOOT_PBL_CUSTOM_PBI_FILE setting)
+endif
+endif # MAKECMDGOALS
+
+# Copy the specified configuration files to holding location
+define UBOOT_CONFIGURE_COPY_CUST_FILES
+ @$(call MESSAGE,"Pre-Configure Hook: Copy Custom PBL Configs")
+ cp -dpf "$(UBOOT_CUST_RCW_FILE)" "$(UBOOT_PBLRCW_FILE)"
+ cp -dpf "$(UBOOT_CUST_PBI_FILE)" "$(UBOOT_PBLPBI_FILE)"
+endef
+UBOOT_PRE_CONFIGURE_HOOKS += UBOOT_CONFIGURE_COPY_CUST_FILES
+endif # BR2_TARGET_UBOOT_PBL_CUST_FORMAT_UBOOT
+
+# Handle custom PBL config file from PE Tool
+ifeq ($(BR2_TARGET_UBOOT_PBL_CUST_FORMAT_PETOOL),y)
+
+# we NEED config file unless we're at make source
+ifeq ($(filter source,$(MAKECMDGOALS)),)
+ifeq ($(UBOOT_CUST_PETOOL_FILE),)
+$(error No PE Tool config file. Check your BR2_TARGET_UBOOT_PBL_CUSTOM_PE_TOOL_FILE setting)
+endif
+ifeq ($(wildcard $(UBOOT_CUST_PETOOL_FILE)),)
+$(error PE Tool config file $(BR2_TARGET_UBOOT_PBL_CUSTOM_PE_TOOL_FILE) not found. Check your BR2_TARGET_UBOOT_PBL_CUSTOM_PE_TOOL_FILE setting)
+endif
+endif # MAKECMDGOALS
+
+# Generate U-Boot PBL config file format from PE Tool Config
+define UBOOT_CONFIGURE_GEN_UBOOT_PBL_CONFIG
+ @$(call MESSAGE,"Pre-Configure Hook: Generate U-Boot PBL Config from PE Tool")
+ @# Extracting the first 144 bytes as they are the RCW
+ cat "$(UBOOT_CUST_PETOOL_FILE)" | sed '/^$$/d' | cut -c 1-144 | \
+ sed 's/\(.\{8\}\)/\1 /g' > $(UBOOT_PBLRCW_FILE)
+ @# The next bytes are the Pre-Boot Initialization commands which
+ @# start at the after byte 144. However, the HEX string contains
+ @# a checksum at the end (16 characters) + 1 line feed char, remove
+ @# them and what is left are the PBI commands.
+ pbi=$$(cat "$(UBOOT_CUST_PETOOL_FILE)" | sed '/^$$/d' | cut -c 145- | \
+ sed 's/.\{17\}$$//' | sed 's/\(.\{8\}\)/\1 /g'); \
+ if [ ! -z "$$pbi" ]; then \
+ echo $$pbi > $(UBOOT_PBLPBI_FILE); \
+ else \
+ rm -f $(UBOOT_PBLPBI_FILE); \
+ touch $(UBOOT_PBLPBI_FILE); \
+ fi
+endef # UBOOT_CONFIGURE_GEN_UBOOT_PBL_CONFIG
+UBOOT_PRE_CONFIGURE_HOOKS += UBOOT_CONFIGURE_GEN_UBOOT_PBL_CONFIG
+
+endif # BR2_TARGET_UBOOT_PBL_CUST_FORMAT_PETOOL
+
+# Insert custom config files to to config.h since u-boot.pbl is used
+ifeq ($(BR2_TARGET_UBOOT_FORMAT_PBL),y)
+# We need to have u-boot use our custom PBL config files
+define UBOOT_CONFIGURE_PBL_CUST_FILE
+ @$(call MESSAGE,"Post-Configure Hook: Add new PBL config files")
+ $(call insert_define,CONFIG_PBLPBI_CONFIG,$(UBOOT_PBLPBI_FILE))
+ $(call insert_define,CONFIG_PBLRCW_CONFIG,$(UBOOT_PBLRCW_FILE))
+endef
+UBOOT_POST_CONFIGURE_HOOKS += UBOOT_CONFIGURE_PBL_CUST_FILE
+endif # BR2_TARGET_UBOOT_FORMAT_PBL
+
+# Handling the building of the RCW.bin (seperate from u-boot)
+ifeq ($(BR2_TARGET_UBOOT_RCW_BIN),y)
+
+# Build RCW.bin
+# The assumption can be made that the configuraiton file type
+# will be in the PE Tool format since menuconfig restricts this
+define UBOOT_BUILD_RCW_BIN
+ @$(call MESSAGE, "Post-Build Hook: Generate RCW.bin")
+ cat "$(UBOOT_CUST_PETOOL_FILE)" | \
+ $(HOST_DIR)/usr/bin/xxd -r -p > $(UBOOT_RCWBIN_FILE)
+endef
+UBOOT_DEPENDENCIES += host-xxd
+UBOOT_POST_BUILD_HOOKS += UBOOT_BUILD_RCW_BIN
+
+# Install the RCW.bin to binaries dir
+define UBOOT_INSTALL_PBL_BIN
+ $(INSTALL) -D -m 0644 $(UBOOT_RCWBIN_FILE) $(BINARIES_DIR)/RCW.bin
+endef
+UBOOT_POST_INSTALL_IMAGES_HOOKS += UBOOT_INSTALL_PBL_BIN
+
+endif # BR2_TARGET_UBOOT_RCW_BIN
+
+endif # BR2_TARGET_UBOOT_PBL_CUSTOM