Commit bdb4c3a6 authored by Peter Korsgaard's avatar Peter Korsgaard
Browse files

Merge branch 'next' 

Conflicts:
	toolchain/kernel-headers/Config.in
parents 5b11223f 2105ecbd

boot/uboot/Config.in

+32 −0
Original line number Diff line number Diff line
@@ -99,6 +99,38 @@ config BR2_TARGET_UBOOT_FORMAT_LDR 


endchoice



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



menuconfig BR2_TARGET_UBOOT_NETWORK

	bool "Custom Network Settings"

	help

boot/uboot/uboot.mk

+25 −0
Original line number Diff line number Diff line
@@ -33,6 +33,7 @@ else ifeq ($(BR2_TARGET_UBOOT_FORMAT_IMG),y) 
UBOOT_BIN          = u-boot.img

else

UBOOT_BIN          = u-boot.bin

UBOOT_BIN_IFT      = $(UBOOT_BIN).ift

endif



UBOOT_ARCH=$(KERNEL_ARCH)
@@ -88,12 +89,36 @@ 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),

		cp -dpf $(@D)/$(BR2_TARGET_UBOOT_SPL_NAME) $(BINARIES_DIR)/)

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



$(eval $(call GENTARGETS))



ifeq ($(BR2_TARGET_UBOOT),y)

linux/linux.mk

+10 −0
Original line number Diff line number Diff line
@@ -183,6 +183,15 @@ define LINUX_INSTALL_KERNEL_IMAGE_TO_TARGET 
endef

endif





define LINUX_INSTALL_HOST_TOOLS

	# Installing dtc (device tree compiler) as host tool, if selected

	if grep -q "CONFIG_DTC=y" $(@D)/.config; then 	\

		$(INSTALL) -D -m 0755 $(@D)/scripts/dtc/dtc $(HOST_DIR)/usr/bin/dtc ;	\

	fi

endef





define LINUX_INSTALL_IMAGES_CMDS

	cp $(LINUX_IMAGE_PATH) $(BINARIES_DIR)

endef
@@ -197,6 +206,7 @@ define LINUX_INSTALL_TARGET_CMDS 
		rm -f $(TARGET_DIR)/lib/modules/$(LINUX_VERSION_PROBED)/build ;		\

		rm -f $(TARGET_DIR)/lib/modules/$(LINUX_VERSION_PROBED)/source ;	\

	fi

	$(LINUX_INSTALL_HOST_TOOLS)

endef



include linux/linux-ext-*.mk

package/Config.in

+14 −0
Original line number Diff line number Diff line
@@ -112,6 +112,7 @@ source "package/fbgrab/Config.in" 
if BR2_PACKAGE_BUSYBOX_SHOW_OTHERS

source "package/fbset/Config.in"

endif

source "package/fbterm/Config.in"

source "package/fbv/Config.in"

source "package/imagemagick/Config.in"

source "package/linux-fusion/Config.in"
@@ -206,6 +207,7 @@ source "package/memtester/Config.in" 
source "package/minicom/Config.in"

source "package/mtd/Config.in"

source "package/ntfs-3g/Config.in"

source "package/ofono/Config.in"

source "package/open2300/Config.in"

source "package/openocd/Config.in"

source "package/parted/Config.in"
@@ -255,6 +257,7 @@ source "package/python/Config.in" 
if BR2_PACKAGE_PYTHON

menu "external python modules"

source "package/python-dpkt/Config.in"

source "package/python-id3/Config.in"

source "package/python-mad/Config.in"

source "package/python-netifaces/Config.in"

source "package/python-pygame/Config.in"
@@ -286,6 +289,7 @@ source "package/portaudio/Config.in" 
source "package/speex/Config.in"

source "package/taglib/Config.in"

source "package/tremor/Config.in"

source "package/webrtc-audio-processing/Config.in"

endmenu



menu "Compression and decompression"
@@ -360,6 +364,7 @@ source "package/tslib/Config.in" 
source "package/libftdi/Config.in"

source "package/libhid/Config.in"

source "package/libiqrf/Config.in"

source "package/libnfc/Config.in"

source "package/libusb/Config.in"

source "package/libusb-compat/Config.in"

source "package/libv4l/Config.in"
@@ -402,12 +407,15 @@ source "package/libmnl/Config.in" 
source "package/libmodbus/Config.in"

source "package/libmbus/Config.in"

source "package/libnetfilter_conntrack/Config.in"

source "package/libnetfilter_cttimeout/Config.in"

source "package/libnfnetlink/Config.in"

source "package/libnl/Config.in"

source "package/liboping/Config.in"

source "package/libpcap/Config.in"

source "package/libosip2/Config.in"

source "package/librsync/Config.in"

source "package/libsoup/Config.in"

source "package/libtorrent/Config.in"

source "package/libupnp/Config.in"

source "package/libvncserver/Config.in"

source "package/zeromq/Config.in"
@@ -470,7 +478,9 @@ endmenu 
endmenu



menu "Miscellaneous"

source "package/collectd/Config.in"

source "package/empty/Config.in"

source "package/mobile-broadband-provider-info/Config.in"

source "package/shared-mime-info/Config.in"

endmenu
@@ -520,6 +530,7 @@ if BR2_PACKAGE_BUSYBOX_SHOW_OTHERS 
source "package/lighttpd/Config.in"

endif

source "package/links/Config.in"

source "package/linphone/Config.in"

source "package/lrzsz/Config.in"

source "package/mii-diag/Config.in"

source "package/mrouted/Config.in"
@@ -558,6 +569,7 @@ source "package/radvd/Config.in" 
source "package/rp-pppoe/Config.in"

source "package/rsh-redone/Config.in"

source "package/rsync/Config.in"

source "package/rtorrent/Config.in"

source "package/samba/Config.in"

source "package/ser2net/Config.in"

source "package/socat/Config.in"
@@ -591,6 +603,7 @@ endmenu 


menu "Package managers"

source "package/ipkg/Config.in"

source "package/opkg/Config.in"

if BR2_PACKAGE_BUSYBOX_SHOW_OTHERS

source "package/rpm/Config.in"

endif
@@ -612,6 +625,7 @@ source "package/file/Config.in" 
source "package/inotify-tools/Config.in"

source "package/lockfile-progs/Config.in"

source "package/logrotate/Config.in"

source "package/logsurfer/Config.in"

source "package/screen/Config.in"

source "package/sudo/Config.in"

if BR2_PACKAGE_BUSYBOX_SHOW_OTHERS

package/Config.in.host

+1 −0
Original line number Diff line number Diff line 
menu "Host utilities"



source "package/lpc3250loader/Config.in.host"

source "package/omap-u-boot-utils/Config.in.host"

source "package/openocd/Config.in.host"

source "package/sam-ba/Config.in.host"

source "package/uboot-tools/Config.in.host"