On 05/08/2014 02:30 PM, Masahiro Yamada wrote:
ps7_init.c and ps7_init.h are supposed to be exported by hw project and copied to board/xilinx/zynq/ directory.
We want them to be ignored by git. So what we should do is to always treat them as external files rather than replacing ps7_init.c
This commit does:
Move a weak function ps7_init() to arch/arm/cpu/armv7/zynq/spl.c and delete board/xilinx/zynq/ps7_init.c
Compile board/xilinx/zynq/ps7_init.c only when it exists
Add .gitignore to ignore ps7_init.c/h
Signed-off-by: Masahiro Yamada yamada.m@jp.panasonic.com Cc: Michal Simek michal.simek@xilinx.com
arch/arm/cpu/armv7/zynq/spl.c | 8 ++++++++ board/xilinx/zynq/.gitignore | 1 + board/xilinx/zynq/Makefile | 5 ++++- board/xilinx/zynq/ps7_init.c | 12 ------------ 4 files changed, 13 insertions(+), 13 deletions(-) create mode 100644 board/xilinx/zynq/.gitignore delete mode 100644 board/xilinx/zynq/ps7_init.c
Signed-off-by: Michal Simek monstr@monstr.eu
Masahiro: I have just tried to run this on the top of my zynq branch with fpga changes I have sent and I can't see any problem in MMC boot mode.
As we discussed earlier - I am doing these changes in zynq-common not to deal with dts files now.
diff --git a/include/configs/zynq-common.h b/include/configs/zynq-common.h index 8e0f93599fc4..fb08a978019a 100644 --- a/include/configs/zynq-common.h +++ b/include/configs/zynq-common.h @@ -226,15 +226,6 @@ #define CONFIG_FIT #define CONFIG_FIT_VERBOSE 1 /* enable fit_format_{error,warning}() */
-/* FDT support */ -#define CONFIG_OF_CONTROL -#define CONFIG_OF_SEPARATE -#define CONFIG_DISPLAY_BOARDINFO_LATE - -/* RSA support */ -#define CONFIG_FIT_SIGNATURE -#define CONFIG_RSA -
And I get this (I am sending generic board enabling for Zynq in a minute).
U-Boot SPL 2014.04-00236-gb861b285b4e9-dirty (May 08 2014 - 15:08:00) mmc boot reading system.dtb spl_load_image_fat_os: error reading image system.dtb, err - -1 reading u-boot.img reading u-boot.img
U-Boot 2014.04-00236-gb861b285b4e9-dirty (May 08 2014 - 15:08:00)
I2C: ready DRAM: Memory: ECC disabled 1 GiB MMC: zynq_sdhci: 0 Using default environment
In: serial Out: serial Err: serial Net: Gem.e000b000 Warning: failed to set MAC address
Hit any key to stop autoboot: 0 zynq-uboot>
Thanks, Michal