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

Merge branch 'next' 



Conflicts:
	Makefile
	package/flac/0001-fix-altivec-logic.patch
	package/grantlee/Config.in

Signed-off-by: default avatarPeter Korsgaard <peter@korsgaard.com>
parents 9a5434fb 9b47f40b

Makefile

+1 −1
Original line number Diff line number Diff line
@@ -28,7 +28,7 @@ 
all:



# Set and export the version string

export BR2_VERSION := 2014.11

export BR2_VERSION := 2015.02-git



# Check for minimal make version (note: this check will break at make 10.x)

MIN_MAKE_VERSION = 3.81

board/boundarydevices/nitrogen6x/post-build.sh

+3 −3
Original line number Diff line number Diff line
@@ -8,11 +8,11 @@ 
BOARD_DIR="$(dirname $0)"



# bd u-boot looks for bootscript here

cp $BOARD_DIR/6x_bootscript $TARGET_DIR

install -D -m 0644 $BOARD_DIR/6x_bootscript $TARGET_DIR/6x_bootscript



# u-boot / update script for bd upgradeu command

if [ -e $BINARIES_DIR/u-boot.imx ];

then

    cp $BINARIES_DIR/u-boot.imx $TARGET_DIR

    cp $BOARD_DIR/6x_upgrade $TARGET_DIR

    install -D -m 0644 $BINARIES_DIR/u-boot.imx $TARGET_DIR/u-boot.imx

    install -D -m 0644 $BOARD_DIR/6x_upgrade $TARGET_DIR/6x_upgrade

fi

board/ci20/readme.txt

0 → 100644
+42 −0
Original line number Diff line number Diff line 
*********************

* MIPS Creator CI20 *

*********************



The 'ci20_defconfig' will create a root filesystem and a kernel image

under the 'output/images/' directory. This document will try to explain how

to use them in order to run Buildroot in the MIPS Creator CI20 board.



Assuming you are at the U-Boot prompt of the MIPS Creator CI20, you have to

load the generated kernel image by using the 'tftpboot' command. In

order to do that, you will need to get the network working. Here you

have the instructions to set the ip address, netmask and gateway:



  setenv ipaddr x.x.x.x

  setenv netmask x.x.x.x

  setenv gatewayip x.x.x.x



Now you have to set the ip for the TFTP server you are going to load the

kernel image from, and also the name of the kernel image file (we use

'uImage' as a filename in this example):



  setenv serverip x.x.x.x

  setenv bootfile uImage



And finally load the kernel image:



  tftpboot



Now you have to extract the generated root filesystem into a USB drive

or SD-Card. Here you have the instructions to boot from the two of them.

You have to choose the one your prefer:



From USB

  setenv bootargs console=ttyS4,115200 console=tty0 mem=256M@0x0

mem=768M@0x30000000 root=/dev/sda1



From SD-Card

  setenv bootargs console=ttyS4,115200 console=tty0 mem=256M@0x0

mem=768M@0x30000000 root=/dev/mmcblk0p1



And finally run this command to boot the board:

  bootm

board/freescale/p1010rdb/linux-3.13.config→board/freescale/p1010rdb/linux-3.17.config

+0 −3
Original line number Diff line number Diff line
@@ -57,11 +57,9 @@ CONFIG_MTD_CFI=y 
CONFIG_MTD_CFI_INTELEXT=y

CONFIG_MTD_CFI_AMDSTD=y

CONFIG_MTD_PHYSMAP_OF=y

CONFIG_MTD_M25P80=y

CONFIG_MTD_NAND=y

CONFIG_MTD_NAND_FSL_ELBC=y

CONFIG_MTD_NAND_FSL_IFC=y

CONFIG_PROC_DEVICETREE=y

CONFIG_BLK_DEV_LOOP=y

CONFIG_BLK_DEV_NBD=y

CONFIG_BLK_DEV_RAM=y
@@ -71,7 +69,6 @@ CONFIG_BLK_DEV_SD=y 
CONFIG_CHR_DEV_ST=y

CONFIG_BLK_DEV_SR=y

CONFIG_CHR_DEV_SG=y

CONFIG_SCSI_MULTI_LUN=y

CONFIG_SCSI_LOGGING=y

CONFIG_ATA=y

CONFIG_SATA_FSL=y

board/freescale/p1010rdb/readme.txt

+1 −1
Original line number Diff line number Diff line
@@ -45,7 +45,7 @@ your newly built U-Boot. 


2. Program the DTB to NOR flash



    => tftp $loadaddr p1010rdb.dtb

    => tftp $loadaddr p1010rdb-pa.dtb

    => erase 0xee000000 +$filesize

    => cp.b $loadaddr 0xee000000 $filesize