[U-Boot] [PATCH v4 00/29] zynq: More boards support
These changes are from u-boot-xlnx.git repo from git.xilinx.com and in addition of basic fdt support. This repo is well tested on xilinx zynq platform, hence pushing the same on upstream.
Excluded qspi and nand changes from previous series.
Please note that all this series available in u-boot-spi.git/master-xlnx repo.
-- Thanks, Jagan.
Changes for v4: - rebase to master - Removed CONFIG_SYS_NO_FLASH in zynq-common.h Changes for v3: - Removed CONFIG_ZYNQ_QSPI - Removed CONFIG_NAND_ZYNQ - Removed CONFIG_SYS_PROMPT_HUSH_PS2 - Documented bootmode detection code - Added comments
Jagannadha Sutradharudu Teki (29): zynq: Enable CONFIG_FIT_VERBOSE zynq: Enable Boot FreeBSD/vxWorks zynq: Cleanup on miscellaneous configs zynq: Cleanup on memory configs zynq: Minor config cleanup zynq: Enable cache options zynq: Add UART0, UART1 configs support zynq: Add GEM0, GEM1 configs support zynq-common: Rename zynq with zynq-common doc: zynq: Add information on zynq u-boot zynq: Add zynq zc70x board support zynq: Add zynq zed board support zynq: Move CONFIG_SYS_SDRAM_SIZE to pre-board configs zynq-common: Define exact TEXT_BASE zynq: zc70x: Add Catalyst 24WC08 EEPROM config support zynq: Add zynq microzed board support zynq: Add zynq_zc770 xm010 board support zynq: Add zynq_zc770 xm013 board support zynq: Add zynq_zc770 xm012 board support zynq: Add support to find bootmode zynq-common: Define default environment zynq-common: Change Env. Sector size to 128Kb zynq-common: Define flash env. partition zynq-common: Define CONFIG_ENV_OVERWRITE dts: zynq: Add basic fdt support gpio: zynq: Add dummy gpio routines zynq-common: Enable verified boot(RSA) dts: zynq: Add more zynq dts files doc: Update the zynq u-boot status
arch/arm/cpu/armv7/zynq/slcr.c | 6 + arch/arm/dts/zynq-7000.dtsi | 13 ++ arch/arm/include/asm/arch-zynq/gpio.h | 25 +++ arch/arm/include/asm/arch-zynq/sys_proto.h | 1 + board/xilinx/dts/zynq-microzed.dts | 14 ++ board/xilinx/dts/zynq-zc702.dts | 14 ++ board/xilinx/dts/zynq-zc706.dts | 14 ++ board/xilinx/dts/zynq-zc770-xm010.dts | 14 ++ board/xilinx/dts/zynq-zc770-xm012.dts | 14 ++ board/xilinx/dts/zynq-zc770-xm013.dts | 14 ++ board/xilinx/dts/zynq-zed.dts | 14 ++ board/xilinx/zynq/board.c | 25 +++ boards.cfg | 8 +- doc/README.zynq | 91 +++++++++++ include/configs/zynq-common.h | 238 +++++++++++++++++++++++++++++ include/configs/zynq.h | 139 ----------------- include/configs/zynq_microzed.h | 25 +++ include/configs/zynq_zc70x.h | 28 ++++ include/configs/zynq_zc770.h | 39 +++++ include/configs/zynq_zed.h | 26 ++++ 20 files changed, 621 insertions(+), 141 deletions(-) create mode 100644 arch/arm/dts/zynq-7000.dtsi create mode 100644 arch/arm/include/asm/arch-zynq/gpio.h create mode 100644 board/xilinx/dts/zynq-microzed.dts create mode 100644 board/xilinx/dts/zynq-zc702.dts create mode 100644 board/xilinx/dts/zynq-zc706.dts create mode 100644 board/xilinx/dts/zynq-zc770-xm010.dts create mode 100644 board/xilinx/dts/zynq-zc770-xm012.dts create mode 100644 board/xilinx/dts/zynq-zc770-xm013.dts create mode 100644 board/xilinx/dts/zynq-zed.dts create mode 100644 doc/README.zynq create mode 100644 include/configs/zynq-common.h delete mode 100644 include/configs/zynq.h create mode 100644 include/configs/zynq_microzed.h create mode 100644 include/configs/zynq_zc70x.h create mode 100644 include/configs/zynq_zc770.h create mode 100644 include/configs/zynq_zed.h
Hi Jagannadha,
On Wed, 8 Jan 2014 15:53:07 +0530, Jagannadha Sutradharudu Teki jagannadha.sutradharudu-teki@xilinx.com wrote:
These changes are from u-boot-xlnx.git repo from git.xilinx.com and in addition of basic fdt support. This repo is well tested on xilinx zynq platform, hence pushing the same on upstream.
Excluded qspi and nand changes from previous series.
Please note that all this series available in u-boot-spi.git/master-xlnx repo.
-- Thanks, Jagan.
Changes for v4:
- rebase to master
- Removed CONFIG_SYS_NO_FLASH in zynq-common.h
As the series was rebased tu u-boot/master, not u-boot-arm/master, all patches adding board support failed to apply properly due to boards.cfg differences.
I did resolve these manually, but at build-test time, all Zynq boards failed with "Makefile:11: *** Please define CONFIG_DEFAULT_DEVICE_TREE in your board header file. Stop." -- and were the only ones to do so.
Jagan, can you look into this and produce a v5 which can build on ARM?
Amicalement,
Hi Albert,
On Wed, Jan 8, 2014 at 10:44 PM, Albert ARIBAUD albert.u.boot@aribaud.net wrote:
Hi Jagannadha,
On Wed, 8 Jan 2014 15:53:07 +0530, Jagannadha Sutradharudu Teki jagannadha.sutradharudu-teki@xilinx.com wrote:
These changes are from u-boot-xlnx.git repo from git.xilinx.com and in addition of basic fdt support. This repo is well tested on xilinx zynq platform, hence pushing the same on upstream.
Excluded qspi and nand changes from previous series.
Please note that all this series available in u-boot-spi.git/master-xlnx repo.
-- Thanks, Jagan.
Changes for v4: - rebase to master - Removed CONFIG_SYS_NO_FLASH in zynq-common.h
As the series was rebased tu u-boot/master, not u-boot-arm/master, all patches adding board support failed to apply properly due to boards.cfg differences.
Yes - I saw this i'll rebase your u-boot-arm/master then.
I did resolve these manually, but at build-test time, all Zynq boards failed with "Makefile:11: *** Please define CONFIG_DEFAULT_DEVICE_TREE in your board header file. Stop." -- and were the only ones to do so.
Actually build will successful when you give the dts at runtime while building u-boot like Linux style. $ make DEVICE_TREE=<dts_file_name> ex: make DEVICE_TREE=zynq-zc702
This is the reason I am not defining this on individual pre-board configs. I guess this could be fine, please comment.
Hi Jagan,
On Wed, 8 Jan 2014 22:57:10 +0530, Jagan Teki jagannadh.teki@gmail.com wrote:
Hi Albert,
On Wed, Jan 8, 2014 at 10:44 PM, Albert ARIBAUD albert.u.boot@aribaud.net wrote:
Hi Jagannadha,
On Wed, 8 Jan 2014 15:53:07 +0530, Jagannadha Sutradharudu Teki jagannadha.sutradharudu-teki@xilinx.com wrote:
These changes are from u-boot-xlnx.git repo from git.xilinx.com and in addition of basic fdt support. This repo is well tested on xilinx zynq platform, hence pushing the same on upstream.
Excluded qspi and nand changes from previous series.
Please note that all this series available in u-boot-spi.git/master-xlnx repo.
-- Thanks, Jagan.
Changes for v4: - rebase to master - Removed CONFIG_SYS_NO_FLASH in zynq-common.h
As the series was rebased tu u-boot/master, not u-boot-arm/master, all patches adding board support failed to apply properly due to boards.cfg differences.
Yes - I saw this i'll rebase your u-boot-arm/master then.
I did resolve these manually, but at build-test time, all Zynq boards failed with "Makefile:11: *** Please define CONFIG_DEFAULT_DEVICE_TREE in your board header file. Stop." -- and were the only ones to do so.
Actually build will successful when you give the dts at runtime while building u-boot like Linux style. $ make DEVICE_TREE=<dts_file_name> ex: make DEVICE_TREE=zynq-zc702
This is the reason I am not defining this on individual pre-board configs. I guess this could be fine, please comment.
Boards in U-Boot are expected to build with commands
make <board>_config make
or with
./MAKEALL <board>
I am therefore not fine with a board which fails when built as above.
Instead of explicitly specifying a DT in the build command line, just make this DT the default one, by following the advice in the error message above, and putting it in the config header files. Each board can (and will, I assume) have its own default DT.
This way, building the board by default will wok, an you will still be able to override the default DT by specifying a different one on the command line if you so wish or need.
Amicalement,
participants (3)
-
Albert ARIBAUD -
Jagan Teki -
Jagannadha Sutradharudu Teki