mirror/u-boot-2016
1
0
Fork 0
mirror of https://git.codelinaro.org/clo/qsdk/oss/boot/u-boot-2016.git synced 2025-12-10 07:44:53 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

ipq806x: Fixed compilation warning

Browse source 
Change-Id: Ifbabe06bdad546d70018448253cb7df107f9001a
Signed-off-by: Ajay Kishore <akisho@codeaurora.org>
This commit is contained in:
Ajay Kishore 2016-10-12 13:02:40 +05:30
parent 623a60fb2a
commit 0effc6b7f9
1 changed files with 1 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
include/configs/ipq806x.h
View file

@ -156,9 +156,7 @@
#define CONFIG_SYS_MMC_ENV_DEV 0
#endif
<<<<<<< HEAD
#define QCA_ROOT_FS_PART_NAME "rootfs"
=======
/*
* CRASH DUMP ENABLE
*/
@ -170,13 +168,10 @@
#undef CONFIG_NET_RETRY_COUNT
#define CONFIG_NET_RETRY_COUNT 500
#endif
>>>>>>> 26ff960... ipq806x : Enable crashdump support
#ifndef __ASSEMBLY__
#include <compiler.h>
<<<<<<< HEAD
=======
/*
* XXX XXX Please do not instantiate this structure. XXX XXX
* This is just a convenience to avoid
@ -200,7 +195,7 @@
typedef struct {
uint8_t nss[16 * 1024 * 1024];
uint8_t smem[2 * 1024 * 1024];
#ifdef CONFIG_IPQ_APPSBL_DLOAD
#ifdef CONFIG_QCA_APPSBL_DLOAD
uint8_t uboot[1 * 1024 * 1024];
uint8_t nsstcmdump[128 * 1024];
uint8_t sbl3[384 * 1024];
@ -221,7 +216,6 @@ typedef struct {
#define IPQ_TEMP_DUMP_ADDR (IPQ_MEM_RESERVE_BASE(nsstcmdump))
#define CONFIG_QCA_SMEM_BASE CONFIG_SYS_SDRAM_BASE + 0x1000000
>>>>>>> 26ff960... ipq806x : Enable crashdump support
#endif /* __ASSEMBLY__ */
#ifndef CONFIG_FIT