summaryrefslogtreecommitdiff
path: root/arch/m68k/cpu
diff options
context:
space:
mode:
authorWolfgang Denk <wd@denx.de>2011-10-21 23:35:12 +0200
committerWolfgang Denk <wd@denx.de>2011-10-21 23:35:12 +0200
commit1b81f017b04b5a176f5f9230ec979f0f3c55ba5b (patch)
treee13192c738bcb50238f6a60ef0448b1e2eec516a /arch/m68k/cpu
parentd639a8ccb0aa3c8c9d4ba0b642951f5534dcbdf1 (diff)
parent3a8653b3ac11b5ee56ce2b8f795826b8bf01eff2 (diff)
downloadu-boot-imx-1b81f017b04b5a176f5f9230ec979f0f3c55ba5b.zip
u-boot-imx-1b81f017b04b5a176f5f9230ec979f0f3c55ba5b.tar.gz
u-boot-imx-1b81f017b04b5a176f5f9230ec979f0f3c55ba5b.tar.bz2
Merge branch 'master' of /home/wd/git/u-boot/master
* 'master' of /home/wd/git/u-boot/master: cosmetic: Fixup fixup_silent_linux() for checkpatch Correct dependency rule to fix SPL build Move timestamp and version files into 'generated' subdir sandbox: Makefile changes to build sandbox architecture Add generic gpio.h in asm-generic Adjust dependency rules to permit per-file flags sandbox: Use uintptr_t for 32/64-bit compatibility sandbox: Add basic config file sandbox: Add serial uart sandbox: Add main program sandbox: Add OS dependent layer sandbox: Force command sections to be 4-byte aligned sandbox: Disable standalone/API support sandbox: Disable built-in malloc sandbox: Add bootm support sandbox: Add board info for architecture sandbox: Add sandbox board sandbox: Add architecture lib files sandbox: Add cpu files sandbox: Add compiler defines to support a 64-bit x86_64 platform sandbox: Add architecture image support Fix use of int as pointer in image.c sandbox: Add architecture header files arm: ca9x4_ct_vxp: enable PXE BOOTP options support arm: ca9x4_ct_vxp: enable pxe command support Convert ca9x4_ct_vxp to standard env variables net: bootp: add PXE/RFC 4578 DHCP options support Add pxe command lib: add uuid_str_to_bin for use with bootp and PXE uuid README: document standard image variables Replace space and tab checks with isblank cosmetic: remove unneeded curly braces Add isblank common: add run_command2 for running simple or hush commands common, menu: use abortboot for menu timeout Add generic, reusable menu code DM9000:Add a byte swap macro for dm9000 io operation. kw_gpio: fix error in kw_gpio_direction_input Blackfin: bfin_spi: fix build error when DEBUG is defined Blackfin: define CONFIG_SYS_CACHELINE_SIZE video: Moving mx3fb.c to CONFIG_VIDEO mx31: make HSP clock for mx3fb driver available MX5: Make IPU display output and pixel format configurable VIDEO: MX5: export pix format VIDEO: MX5: Switch MX5 to CONFIG_VIDEO video: update the Freescale DIU driver to use linux/fb.h powerpc: cpm2 boards: update fcc register logic
Diffstat (limited to 'arch/m68k/cpu')
0 files changed, 0 insertions, 0 deletions