9
0
Fork 0
Commit Graph

4187 Commits

Author SHA1 Message Date
Steffen Trumtrar 6bc8812e83 arm: mach-imx: add more ddr register defines
Signed-off-by: Steffen Trumtrar <s.trumtrar@pengutronix.de>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
2014-09-19 07:44:37 +02:00
Lucas Stach 33bd1c4ef5 arm: imx6: add Gateworks Ventana board
For now only the Quad 1GB variant is supported.

Tested:
- starting barebox over USB
- writing barebox to NAND with barebox_update
- starting Linux kernel over TFTP

Signed-off-by: Lucas Stach <dev@lynxeye.de>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
2014-09-17 11:16:45 +02:00
Sascha Hauer 5a5ba5ad30 ARM: AT91: Make gpio mux functions inline
Otherwise we get a unused function warning each time mach/gpio.h
is included.

Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
2014-09-09 09:52:21 +02:00
Sascha Hauer a918dbfdf2 ARM: AT91: Add missing include
the gpio mux functions were moved to mach/gpio.h. Add the missing
include.

Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
2014-09-09 09:52:14 +02:00
Christian Hemp 3546ffe842 dts:imx6:pfla02: Fix SPI NOR for phyFLEX-i.MX6
Add chip-select property to pfla02 devicetree.

Signed-off-by: Christian Hemp <c.hemp@phytec.de>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
2014-09-08 07:40:56 +02:00
Sascha Hauer c96a4f2831 Merge branch 'for-next/marvell' 2014-09-05 07:32:56 +02:00
Sascha Hauer 0802b9312b Merge branch 'for-next/dts' 2014-09-05 07:32:54 +02:00
Sascha Hauer d12cc92639 Merge branch 'for-next/at91' 2014-09-05 07:32:54 +02:00
Raphaël Poggi 71ff9bfebd pinctrl: at91: add pinctrl driver
This driver is based on mach-at91/gpio.c and linux pinctrl driver.
The driver contains the gpio and pinctrl parts (like in linux) because the two parts
share some structures and logics.

Signed-off-by: Raphaël Poggi <poggi.raph@gmail.com>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
2014-09-04 11:25:04 +02:00
Michael Olbrich ee3254569d EFI: add missing include
Otherwise building produces these warnings:
[...]
arch/efi/efi/efi-image.c:48:2: warning: implicit declaration of function 'read_file' [-Wimplicit-function-declaration]
arch/efi/efi/efi-image.c:48:6: warning: assignment makes pointer from integer without a cast [enabled by default]
[...]

And bootm fails for x86_64. The implicit declaration has an int as return
value, so half of the returned address is lost.

Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
2014-09-03 15:53:22 +02:00
Raphaël Poggi e9194e62ec arm: mach-at91: move gpio.h to include folder
This commit add functions from mach-at91/gpio.h in include/mach/gpio.h.
This allow to use these functions outside the mach-at91 folder.

Signed-off-by: Raphaël Poggi <poggi.raph@gmail.com>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
2014-09-03 08:58:07 +02:00
Raphaël Poggi 54bccadddd mtd: atmel_nand: retrieve ecc_mode from pdata
By retrieving the ecc_mode from pdata we can use the same code for device tree and
non device tree probing. Which was not possible before, because ecc_mode was arbitrarily set to
NAND_ECC_SOFT.

Signed-off-by: Raphaël Poggi <poggi.raph@gmail.com>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
2014-09-02 11:03:22 +02:00
Sascha Hauer 7955f43151 ARM: dts: move imx6q-embedsky-e9.dtsi to arch/arm/dts/boot
dts/ is for upstream dts files only. Move barebox specific file
to arch/arm/dts/ so that it doesn't get removed by the next
dts update.

Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
2014-09-02 10:59:23 +02:00
Sascha Hauer e9dcc2eaa1 ARM: dts: Use local version of rk3188-clocks.dtsi
As of 3.17-rc1 the upstream dts sources for the rockchip rk3188 use
incompatible clock bindings. We currently do not have the resources
to update the clock driver to this new binding, so we use local copies
of the Linux 3.16 dtsi files. Due to the incompatible change the
internal device tree won't work with kernels newer than 3.17-rc1.

Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
2014-09-02 09:17:17 +02:00
Raphaël Poggi af8e7d3a6e mtd: nand: add has_pmecc member
By adding this structure member, we can retrieve the pmecc config, through the device tree.

Signed-off-by: Raphaël Poggi <poggi.raph@gmail.com>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
2014-09-02 09:02:40 +02:00
Antony Pavlov bbd0f7300b openrisc: add barebox.lds to .gitignore
Signed-off-by: Antony Pavlov <antonynpavlov@gmail.com>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
2014-09-01 14:24:51 +02:00
Lucas Stach 9027f85c62 arm: nitrogen6x: new memory setup from BD u-boot
This fixes various stability issues seen on new boards
with the old setup.

Signed-off-by: Lucas Stach <l.stach@pengutronix.de>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
2014-09-01 14:24:51 +02:00
Lucas Stach ce8ed79d56 arm: mach-imx: add MMDC and CCM register defines for use in DCD
Makes .imxcfg files a lot more readable.

Signed-off-by: Lucas Stach <l.stach@pengutronix.de>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
2014-09-01 14:24:51 +02:00
Sascha Hauer a744d02298 ARM: i.MX: tqma53: remove cpu_to_be32( from imx script
Remove leftovers from previous conversion from C code to imxcfg
script.

Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
2014-09-01 14:24:51 +02:00
Michael Olbrich 53c443ce72 EFI: fix error handling in efi_get_boot()
efi_get_global_var() returns an error code, not NULL when it fails.

Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
2014-09-01 14:24:50 +02:00
Ezequiel Garcia 906afb5331 ARM: mvebu: Add Plat'home's Kirkwood Openblocks A6 board support
This commit adds a new Marvell Kirkwood-based board, by following the currently
supported boards.

Signed-off-by: Ezequiel Garcia <ezequiel.garcia@free-electrons.com>
Acked-by: Sebastian Hesselbarth <sebastian.hesselbarth@gmail.com>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
2014-09-01 11:31:08 +02:00
Sascha Hauer 038be0fbb5 Merge branch 'for-next/usb' 2014-08-07 13:13:47 +02:00
Sascha Hauer 9cce00617b Merge branch 'for-next/rtc'
Conflicts:
	arch/mips/dts/jz4755.dtsi
	commands/Makefile
2014-08-07 13:13:45 +02:00
Sascha Hauer ba465b6c4d Merge branch 'for-next/ppc' 2014-08-07 13:13:36 +02:00
Sascha Hauer 38c3b2455e Merge branch 'for-next/misc'
Conflicts:
	lib/Makefile
2014-08-07 13:13:31 +02:00
Sascha Hauer 5b7b7ee5d9 Merge branch 'for-next/metadata'
Conflicts:
	arch/arm/dts/Makefile
	common/Makefile
	lib/Makefile
2014-08-07 06:15:16 +02:00
Sascha Hauer f1ee4e8b73 Merge branch 'for-next/marvell' 2014-08-07 06:14:59 +02:00
Sascha Hauer c138893990 Merge branch 'for-next/led' 2014-08-07 06:14:59 +02:00
Sascha Hauer 7e094e336c Merge branch 'for-next/imx' 2014-08-07 06:14:58 +02:00
Sascha Hauer 8a11a59b37 Merge branch 'for-next/efi'
Conflicts:
	.gitignore
	Makefile
	drivers/serial/Makefile
2014-08-07 06:14:56 +02:00
Sascha Hauer 3522192d6d Merge branch 'for-next/canon' 2014-08-07 06:14:18 +02:00
Sascha Hauer 8762b3046e Merge branch 'for-next/arm' 2014-08-07 06:14:18 +02:00
Sascha Hauer a1c68f678f Merge branch 'for-next/am335x' 2014-08-07 06:14:18 +02:00
Antony Pavlov 07f93f5452 MIPS: qemu-malta_defconfig: enable metadata in barebox image (IMD)
Usage:

  $ qemu-system-mips -nodefaults -nographic -M malta -m 256 \
        -serial stdio -monitor null \
        -bios ./barebox-flash-image

  ...

  barebox:/ imd /dev/nor0
  release: 2014.07.0-00401-gd863821
  build: #148 Sat Aug 2 09:22:16 MSK 2014

Signed-off-by: Antony Pavlov <antonynpavlov@gmail.com>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
2014-08-07 06:13:53 +02:00
Antony Pavlov 019a33dad4 MIPS: add support for metadata in barebox images
Signed-off-by: Antony Pavlov <antonynpavlov@gmail.com>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
2014-08-07 06:13:52 +02:00
Sascha Hauer 97e81f2d78 Add support for metadata in barebox images
It's often useful to get some information about a barebox image
before starting or flashing it. This patch introduces barebox
Image MetaData (IMD). When enabled a barebox image will contain
a list of tags containing the desired information. We have tags
for:

- the barebox release (2014.07.0-00160-g035de50-dirty)
- the build timestamp (#741 Mon Jul 28 15:08:54 CEST 2014)
- the board model the image is intended for
- the device tree toplevel compatible property

Also there is an additional generic key-value store which stores
parameters for which no dedicated tag exists. In this patch it
is used for the memory size an image supports.

Since there is no fixed offset in a barebox image which can be
used for storing the information, the metadata is stored somewhere
in the image and found by iterating over the image. This works
for most image types, but obviously not for SoC images which are
encoded or encrypted in some way.

There is a 'imd' tool compiled from the same sources for barebox,
for the compile host and for the target, so the metadata information
is available whereever needed.

For device tree boards the model and of_compatible tags are automatically
generated.

Example output of the imd tool for a Phytec phyFLEX image:

build: #889 Wed Jul 30 16:08:54 CEST 2014
release: 2014.07.0-00167-g6b2070d-dirty
parameter: memsize=1024
of_compatible: phytec,imx6x-pbab01 phytec,imx6dl-pfla02 fsl,imx6dl
model: Phytec phyFLEX-i.MX6 Duallite Carrier-Board

Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
2014-08-07 06:13:52 +02:00
Sascha Hauer fb60ba388b make: build device trees with obj-dtb-y and pbl-dtb-y
To build an object file from a device tree currently we currently
have to add them to the Makefile twice, once to dtb-y and once to
obj-y. This patch introduces obj-dtb-y and pbl-dtb-y to directly
compile a device tree object file for inclusion in the barebox binary
or the pbl respectively.
The now unneeded dtb-y targets are removed.

Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
2014-08-07 06:13:52 +02:00
Sascha Hauer 3cfa4bc00c move file helper functions to separate file
We have our file helper functions in several places. Move them
all to lib/libfile.c.
With this we no longer have file helpers in fs/fs.c which contains
the core fs functions and no functions in lib/libbb.c which are
not from busybox.

Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
2014-08-07 06:13:51 +02:00
Jan Luebbe 94611b28bc ARM: AM335x: Beaglebone: enable ethernet
The ethernet mac and mdio nodes must be explicitly enabled to override
the disabled setting in am33xx.dtsi.

Signed-off-by: Jan Luebbe <jlu@pengutronix.de>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
2014-08-04 20:53:29 +02:00
Antony Pavlov 642f8fbed8 MIPS: ritmix-rzx50_defconfig: enable RTC support
Also enable CONFIG_LONGHELP.

Signed-off-by: Antony Pavlov <antonynpavlov@gmail.com>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
2014-08-02 06:45:43 +02:00
Antony Pavlov 07f06779f8 MIPS: dts: jz4755.dtsi: add jz4740-rtc
Signed-off-by: Antony Pavlov <antonynpavlov@gmail.com>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
2014-08-02 06:45:43 +02:00
Antony Pavlov e1af262100 ARM: versatilepb_defconfig: enable RTC support
Use this qemu cmdline to test hwclock

  $ qemu-system-arm -M versatilepb -nographic \
      -monitor null -kernel barebox -serial stdio

Signed-off-by: Antony Pavlov <antonynpavlov@gmail.com>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
2014-08-02 06:45:43 +02:00
Matteo Fortini a2d5ca0fd9 ARM: atmel: sama5d3_xplained: import smc timing from U-Boot
The configuration for NAND has been aligned with values
from U-Boot and completed with TIMINGS initialization

Signed-off-by: Matteo Fortini <matteo.fortini@gmail.com>
[voice.shen@atmel.com: apply this patch from Matteo Fortini for
		       sama5d3xek to sama5d3_xplained board]
Signed-off-by: Bo Shen <voice.shen@atmel.com>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
2014-08-02 06:37:22 +02:00
Antony Pavlov 1040bfbbd6 ARM: DIGIC: add canon-a1100_defconfig
Signed-off-by: Antony Pavlov <antonynpavlov@gmail.com>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
2014-08-01 15:40:41 +02:00
Antony Pavlov f708453459 ARM: add Canon A1100 ROM image generation
Signed-off-by: Antony Pavlov <antonynpavlov@gmail.com>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
2014-08-01 15:40:41 +02:00
Sascha Hauer c1016b29f7 ARM: AM3355x: Update defconfig
Most diffstat comes from refreshing the config. The only real change
is that the NAND xload update handler is enabled now.

Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
2014-08-01 15:24:39 +02:00
Sascha Hauer 6efdb42e90 ARM: phyCORE-am335x: Add support for more SDRAM configurations
This adds support for 256MB and 128MB RAM configurations of the
phyCORE-AM335x. This is done as new images.

Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
2014-08-01 15:23:35 +02:00
Sascha Hauer bcf7cde48c ARM: phyCORE-am335x: read back SDRAM controller settings
- use am335x_barebox_entry() to remove the need for hardcoded SDRAM
  size
- remove hardcoded memory settings from device tree since there are
  different memory sizes available for this board.

Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
2014-08-01 15:22:42 +02:00
Sascha Hauer 61cbf21fd5 ARM: AM33xx: Add SDRAM size detection
This adds a function which reads back the SDRAM controller settings.
This is used in a AM33xx specific barebox entry function and a
SDRAM driver which registers a SDRAM memory bank.

Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
2014-08-01 15:22:42 +02:00
Antony Pavlov b549a26fc3 watchdog: add minimal jz4740 driver
Also move reset_cpu() for jz4755 SoC from platform code
into the new driver code.

At the moment mach-xburst lacks clk support so jz4740 watchdog
driver looks like a template. We can improve jz4740 watchdog
driver later after adding clk support.

Signed-off-by: Antony Pavlov <antonynpavlov@gmail.com>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
2014-08-01 07:35:51 +02:00