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

Merge branch 'next' 



Signed-off-by: default avatarPeter Korsgaard <peter@korsgaard.com>
parents 2723fa4a 01e3d2ef

Config.in

+4 −2
Original line number Diff line number Diff line
@@ -165,8 +165,10 @@ config BR2_PRIMARY_SITE 
	  Primary site to download from. If this option is set then buildroot

	  will try to download package source first from this site and try the

	  default if the file is not found.

	  Valid URIs are URIs recognized by $(WGET) and scp URIs of the form

	  scp://[user@]host:path.

	  Valid URIs are:

	    - URIs recognized by $(WGET)

	    - local URIs of the form file://absolutepath

	    - scp URIs of the form scp://[user@]host:path.



config BR2_PRIMARY_SITE_ONLY

	bool "Only allow downloads from primary download site"

Config.in.legacy

+12 −0
Original line number Diff line number Diff line
@@ -104,6 +104,18 @@ comment "build, or run, in unpredictable ways. " 
comment "----------------------------------------------------"

endif



###############################################################################

comment "Legacy options removed in 2016.02"



config BR2_PACKAGE_INFOZIP

	bool "infozip option has been renamed to zip"

	select BR2_LEGACY

	select BR2_PACKAGE_ZIP

	help

	  Info-Zip's Zip package has been renamed from infozip to zip,

	  to avoid ambiguities with Info-Zip's UnZip which has been added

	  in the unzip package.



###############################################################################

comment "Legacy options removed in 2015.11"

Makefile

+5 −2
Original line number Diff line number Diff line
@@ -818,10 +818,13 @@ ifeq ($(NEED_WRAPPER),y) 
	$(Q)$(TOPDIR)/support/scripts/mkmakefile $(TOPDIR) $(O)

endif



# printvars prints all the variables currently defined in our Makefiles

# printvars prints all the variables currently defined in our

# Makefiles. Alternatively, if a non-empty VARS variable is passed,

# only the variables matching the make pattern passed in VARS are

# displayed.

printvars:

	@$(foreach V, \

		$(sort $(.VARIABLES)), \

		$(sort $(if $(VARS),$(filter $(VARS),$(.VARIABLES)),$(.VARIABLES))), \

		$(if $(filter-out environment% default automatic, \

				$(origin $V)), \

		$(info $V=$($V) ($(value $V)))))

board/intel/galileo/genimage.cfg

0 → 100644
+31 −0
Original line number Diff line number Diff line 
# Create an image of the efi partition

image efi-part.vfat {

	vfat {

		file startup.nsh {

			image = "efi-part/startup.nsh"

		}

		file EFI {

			image = "efi-part/EFI"

		}

	}

	size=512K

}



# Create the sdcard image, pulling in

#  * the image created by buildroot

#  * the efi-partition created above

image sdcard.img {

	hdimage {

	}



	partition boot {

		partition-type = 0xC

		image = "efi-part.vfat"

	}



	partition rootfs {

		partition-type = 0x83

		image = "rootfs.ext2"

		size = 512M

	}

}

board/intel/galileo/grub.cfg

0 → 100644
+11 −0
Original line number Diff line number Diff line 
set default="0"

set timeout="0"



menuentry "Buildroot" {

	# Grub2 supports ext4, load the kernel from the Linux rootfs partition

	# Set root tells grub to search the 2nd partition for the bzImage

	set root=(hd0,msdos2)



	# Set Linux to boot from the 2nd partition, SD/MMC support is baked into the kernel

	linux /boot/bzImage root=/dev/mmcblk0p2 rootwait console=ttyS1,115200n8 earlycon=uart8250,mmio32,0x9000b000,115200n8 reboot=efi,warm apic=debug rw

}