mirror/u-boot-2016
1
0
Fork 0
mirror of https://git.codelinaro.org/clo/qsdk/oss/boot/u-boot-2016.git synced 2026-03-14 21:10:27 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge "bootm: Setting fdt_high at the end of board_init"

Browse source
This commit is contained in:
Linux Build Service Account 2018-07-11 03:09:26 -07:00 • committed by Gerrit - the friendly Code Review server
commit be93aec901
3 changed files with 11 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
arch/arm/include/asm/arch-qca-common/qca_common.h
View file

@ -29,6 +29,9 @@
#include <asm/arch-ipq806x/clock.h>
#endif
#define XMK_STR(x)#x
#define MK_STR(x)XMK_STR(x)
struct ipq_i2c_platdata {
int type;
};

7
board/qca/arm/common/board_init.c
View file

@ -13,6 +13,7 @@
#include <common.h>
#include <environment.h>
#include <asm/arch-qca-common/qca_common.h>
#include <asm/arch-qca-common/smem.h>
#include <asm/arch-qca-common/uart.h>
#include <asm/arch-qca-common/gpio.h>
@ -332,6 +333,12 @@ int board_late_init(void)
}
#endif
set_ethmac_addr();
/*
* set fdt_high parameter so that u-boot will not
* load dtb above CONFIG_IPQ_FDT_HIGH region.
*/
run_command("setenv fdt_high " MK_STR(CONFIG_IPQ_FDT_HIGH) "\n", 0);
return 0;
}

3
board/qca/arm/common/cmd_bootqca.c
View file

@ -29,11 +29,10 @@
#include <spi_flash.h>
#include <spi.h>
#include <asm/arch-qca-common/iomap.h>
#include <asm/arch-qca-common/qca_common.h>
#include <asm/io.h>
#define DLOAD_MAGIC_COOKIE 0x10
#define XMK_STR(x)#x
#define MK_STR(x)XMK_STR(x)
#define MAX_TFTP_SIZE 0x40000000
static int debug = 0;