2014-12-23
Merge branch 'master' of github.com:semerlin/iMX28-EVK-PDK1_9

Conflicts:
	Build.dat
	Build.log
	SRC/COMMON/ARGS/obj/ARMV4I/retail/args.obj
	SRC/COMMON/BSPCMN/obj/ARMV4I/retail/bspargs.obj
	SRC/COMMON/BSPCMN/obj/ARMV4I/retail/bsputils.obj
	SRC/COMMON/BSPCMN/obj/ARMV4I/retail/debugserial.obj
	SRC/COMMON/BSPENET/obj/ARMV4I/retail/bspenet.obj
	SRC/COMMON/NANDBOOTBURNER/obj/ARMV4I/retail/NandBootBurner.obj
	SRC/COMMON/NANDBOOTBURNER/obj/ARMV4I/retail/OTP.obj
	SRC/COMMON/NANDFMD/obj/ARMV4I/retail/nandbsp.obj
	SRC/COMMON/USBFN/RNDISKITL/obj/ARMV4I/retail/hwinit.obj
	SRC/COMMON/USBFN/RNDISKITL/obj/ARMV4I/retail/stub.obj
	SRC/DRIVERS/BACKLIGHT/DRIVER/obj/ARMV4I/retail/bspbacklight.obj
	SRC/DRIVERS/CALLBTN/CallButton.h
	SRC/DRIVERS/CSPDDK/DDK_CLK/obj/ARMV4I/retail/ddk_clk.obj
	SRC/DRIVERS/DISPLAY/obj/ARMV4I/retail/43wvf1g.obj
	SRC/DRIVERS/DISPLAY/obj/ARMV4I/retail/bsplcdif.obj
	SRC/DRIVERS/DISPLAY/obj/ARMV4I/retail/display_controller_factory.obj
	SRC/DRIVERS/DISPLAY/obj/ARMV4I/retail/lms430.obj
	SRC/DRIVERS/ENET/obj/ARMV4I/retail/bspenet.obj
	SRC/DRIVERS/I2C/PDK/obj/ARMV4I/retail/bspi2c.obj
	SRC/DRIVERS/NANDFMD/obj/ARMV4I/retail/nfc_sys.obj
	SRC/DRIVERS/PMU/PDK/obj/ARMV4I/retail/bsppmu.obj
	SRC/DRIVERS/RS485SWITCH/obj/ARMV4I/retail/RS485Switch.obj
	SRC/DRIVERS/SERIAL/obj/ARMV4I/retail/bspserial.obj
	SRC/DRIVERS/SERIALDEBUG/obj/ARMV4I/retail/bspdserial.obj
	SRC/DRIVERS/SPI/PDK/obj/ARMV4I/retail/bspspi.obj
	SRC/DRIVERS/TOUCH/obj/ARMV4I/retail/touchbsp.obj
	SRC/DRIVERS/USBD/obj/ARMV4I/retail/hwinit.obj
	SRC/DRIVERS/USBD/obj/ARMV4I/retail/i_usbclock.obj
	SRC/DRIVERS/USBD/obj/ARMV4I/retail/i_usbutils.obj
	SRC/DRIVERS/USBH/HSH1/obj/ARMV4I/retail/i_hwinit.obj
	SRC/DRIVERS/USBH/HSH1/obj/ARMV4I/retail/i_usbclock.obj
	SRC/DRIVERS/USBH/HSH1/obj/ARMV4I/retail/i_usbutils.obj
	SRC/DRIVERS/USBH/HSOTG/obj/ARMV4I/retail/i_hwinit.obj
	SRC/DRIVERS/USBH/HSOTG/obj/ARMV4I/retail/i_usbclock.obj
	SRC/DRIVERS/USBH/HSOTG/obj/ARMV4I/retail/i_usbutils.obj
	SRC/DRIVERS/USBOTG/obj/ARMV4I/retail/fsl_usbotg.obj
	SRC/DRIVERS/USBOTG/obj/ARMV4I/retail/i_usbclock.obj
	SRC/DRIVERS/USBOTG/obj/ARMV4I/retail/i_usbutils.obj
	SRC/DRIVERS/USBOTG/obj/ARMV4I/retail/ist.obj
	SRC/DRIVERS/WAVEDEV2/SGTL5000/obj/ARMV4I/retail/bsphwctxt.obj
	SRC/DRIVERS/WAVEDEV2/SGTL5000/obj/ARMV4I/retail/sgtl5000codec.obj
	SRC/KITL/obj/ARMV4I/retail/kitl.obj
	SRC/OAL/OALIOCTL/obj/ARMV4I/retail/oalioctl.obj
	SRC/OAL/OALLIB/obj/ARMV4I/retail/init.obj
	SRC/OAL/OALLIB/obj/ARMV4I/retail/intr.obj
	SRC/OAL/OALLIB/obj/ARMV4I/retail/ioctl.obj
	SRC/OAL/OALLIB/obj/ARMV4I/retail/oal_startup.obj
	SRC/OAL/OALLIB/obj/ARMV4I/retail/power.obj
	SRC/OAL/OALLIB/obj/ARMV4I/retail/startup.obj
	SRC/OAL/OALLIB/obj/ARMV4I/retail/timer.obj
	SRC/OAL/OALLIB/obj/ARMV4I/retail/wfi.obj
	lib/ARMV4I/retail/args.pdb
	lib/ARMV4I/retail/bspcmn.pdb
	lib/ARMV4I/retail/bspenet.pdb
	lib/ARMV4I/retail/ddk_clk.pdb
	lib/ARMV4I/retail/fsl_usbfn_rndiskitl_mx28_fsl_v2_pdk1_9.pdb
	lib/ARMV4I/retail/nandbootburner.pdb
	lib/ARMV4I/retail/nandfmd_lib.pdb
	lib/ARMV4I/retail/oal.pdb
	target/ARMV4I/retail/backlight.pdb
	target/ARMV4I/retail/csp_serial.pdb
	target/ARMV4I/retail/ddraw_mx28.pdb
	target/ARMV4I/retail/debug_serial.pdb
	target/ARMV4I/retail/flashpdd_nand.pdb
	target/ARMV4I/retail/i2c.pdb
	target/ARMV4I/retail/kitl.pdb
	target/ARMV4I/retail/lradc_touch.pdb
	target/ARMV4I/retail/oalioctl.pdb
	target/ARMV4I/retail/pmupdk.pdb
	target/ARMV4I/retail/sdhc.pdb
	target/ARMV4I/retail/usbfn.pdb
	target/ARMV4I/retail/wavedev2_sgtl5000.pdb