Merge branch 'master' of git://git.denx.de/u-boot-arm into master
Conflicts:
arch/arm/cpu/arm926ejs/mxs/mxsimage.mx23.cfg
arch/arm/cpu/arm926ejs/mxs/mxsimage.mx28.cfg
Signed-off-by:
Stefano Babic <sbabic@denx.de>
Showing
- .gitignore 4 additions, 0 deletions.gitignore
- Makefile 44 additions, 60 deletionsMakefile
- README 3 additions, 0 deletionsREADME
- api/api_platform-powerpc.c 1 addition, 1 deletionapi/api_platform-powerpc.c
- arch/arc/config.mk 6 additions, 4 deletionsarch/arc/config.mk
- arch/arm/config.mk 16 additions, 9 deletionsarch/arm/config.mk
- arch/arm/cpu/arm720t/tegra-common/cpu.c 2 additions, 3 deletionsarch/arm/cpu/arm720t/tegra-common/cpu.c
- arch/arm/cpu/arm720t/tegra114/config.mk 0 additions, 19 deletionsarch/arm/cpu/arm720t/tegra114/config.mk
- arch/arm/cpu/arm720t/tegra124/config.mk 0 additions, 7 deletionsarch/arm/cpu/arm720t/tegra124/config.mk
- arch/arm/cpu/arm720t/tegra124/cpu.c 2 additions, 2 deletionsarch/arm/cpu/arm720t/tegra124/cpu.c
- arch/arm/cpu/arm720t/tegra20/config.mk 0 additions, 10 deletionsarch/arm/cpu/arm720t/tegra20/config.mk
- arch/arm/cpu/arm720t/tegra30/config.mk 0 additions, 19 deletionsarch/arm/cpu/arm720t/tegra30/config.mk
- arch/arm/cpu/arm926ejs/at91/at91sam9263_devices.c 25 additions, 0 deletionsarch/arm/cpu/arm926ejs/at91/at91sam9263_devices.c
- arch/arm/cpu/arm926ejs/mxs/Makefile 7 additions, 6 deletionsarch/arm/cpu/arm926ejs/mxs/Makefile
- arch/arm/cpu/arm926ejs/mxs/mxsimage.mx23.cfg 2 additions, 2 deletionsarch/arm/cpu/arm926ejs/mxs/mxsimage.mx23.cfg
- arch/arm/cpu/arm926ejs/mxs/mxsimage.mx28.cfg 2 additions, 2 deletionsarch/arm/cpu/arm926ejs/mxs/mxsimage.mx28.cfg
- arch/arm/cpu/arm926ejs/mxs/u-boot-imx23.bd 2 additions, 2 deletionsarch/arm/cpu/arm926ejs/mxs/u-boot-imx23.bd
- arch/arm/cpu/arm926ejs/mxs/u-boot-imx28.bd 2 additions, 2 deletionsarch/arm/cpu/arm926ejs/mxs/u-boot-imx28.bd
- arch/arm/cpu/armv7/am33xx/board.c 3 additions, 5 deletionsarch/arm/cpu/armv7/am33xx/board.c
- arch/arm/cpu/armv7/exynos/pinmux.c 29 additions, 0 deletionsarch/arm/cpu/armv7/exynos/pinmux.c
Loading
Please register or sign in to comment