/openbmc/u-boot/drivers/serial/ |
H A D | serial_ns16550.c | 76b40ab4 Mon Mar 11 11:02:40 CDT 2013 Tom Rini <trini@ti.com> Merge u-boot/master into u-boot-ti/master In master we had already taken a patch to fix the davinci GPIO code for CONFIG_SOC_DM646X and in u-boot-ti we have additional patches to support DA830 (which is CONFIG_SOC_DA8XX && !CONFIG_SOC_DA850). Resolve these conflicts manually and comment the #else/#endif lines for clarity. Conflicts: arch/arm/include/asm/arch-davinci/gpio.h drivers/gpio/da8xx_gpio.c Signed-off-by: Tom Rini <trini@ti.com>
|
/openbmc/u-boot/arch/x86/cpu/ |
H A D | u-boot.lds | 76b40ab4 Mon Mar 11 11:02:40 CDT 2013 Tom Rini <trini@ti.com> Merge u-boot/master into u-boot-ti/master In master we had already taken a patch to fix the davinci GPIO code for CONFIG_SOC_DM646X and in u-boot-ti we have additional patches to support DA830 (which is CONFIG_SOC_DA8XX && !CONFIG_SOC_DA850). Resolve these conflicts manually and comment the #else/#endif lines for clarity. Conflicts: arch/arm/include/asm/arch-davinci/gpio.h drivers/gpio/da8xx_gpio.c Signed-off-by: Tom Rini <trini@ti.com>
|
/openbmc/u-boot/board/corscience/tricorder/ |
H A D | tricorder.c | 76b40ab4 Mon Mar 11 11:02:40 CDT 2013 Tom Rini <trini@ti.com> Merge u-boot/master into u-boot-ti/master In master we had already taken a patch to fix the davinci GPIO code for CONFIG_SOC_DM646X and in u-boot-ti we have additional patches to support DA830 (which is CONFIG_SOC_DA8XX && !CONFIG_SOC_DA850). Resolve these conflicts manually and comment the #else/#endif lines for clarity. Conflicts: arch/arm/include/asm/arch-davinci/gpio.h drivers/gpio/da8xx_gpio.c Signed-off-by: Tom Rini <trini@ti.com>
|
/openbmc/u-boot/arch/arm/include/asm/arch-am33xx/ |
H A D | spl.h | 76b40ab4 Mon Mar 11 11:02:40 CDT 2013 Tom Rini <trini@ti.com> Merge u-boot/master into u-boot-ti/master In master we had already taken a patch to fix the davinci GPIO code for CONFIG_SOC_DM646X and in u-boot-ti we have additional patches to support DA830 (which is CONFIG_SOC_DA8XX && !CONFIG_SOC_DA850). Resolve these conflicts manually and comment the #else/#endif lines for clarity. Conflicts: arch/arm/include/asm/arch-davinci/gpio.h drivers/gpio/da8xx_gpio.c Signed-off-by: Tom Rini <trini@ti.com>
|
/openbmc/u-boot/fs/ext4/ |
H A D | ext4_write.c | 76b40ab4 Mon Mar 11 11:02:40 CDT 2013 Tom Rini <trini@ti.com> Merge u-boot/master into u-boot-ti/master In master we had already taken a patch to fix the davinci GPIO code for CONFIG_SOC_DM646X and in u-boot-ti we have additional patches to support DA830 (which is CONFIG_SOC_DA8XX && !CONFIG_SOC_DA850). Resolve these conflicts manually and comment the #else/#endif lines for clarity. Conflicts: arch/arm/include/asm/arch-davinci/gpio.h drivers/gpio/da8xx_gpio.c Signed-off-by: Tom Rini <trini@ti.com>
|
/openbmc/u-boot/lib/ |
H A D | display_options.c | 76b40ab4 Mon Mar 11 11:02:40 CDT 2013 Tom Rini <trini@ti.com> Merge u-boot/master into u-boot-ti/master In master we had already taken a patch to fix the davinci GPIO code for CONFIG_SOC_DM646X and in u-boot-ti we have additional patches to support DA830 (which is CONFIG_SOC_DA8XX && !CONFIG_SOC_DA850). Resolve these conflicts manually and comment the #else/#endif lines for clarity. Conflicts: arch/arm/include/asm/arch-davinci/gpio.h drivers/gpio/da8xx_gpio.c Signed-off-by: Tom Rini <trini@ti.com>
|
/openbmc/u-boot/arch/arm/include/asm/arch-omap3/ |
H A D | mmc_host_def.h | 76b40ab4 Mon Mar 11 11:02:40 CDT 2013 Tom Rini <trini@ti.com> Merge u-boot/master into u-boot-ti/master In master we had already taken a patch to fix the davinci GPIO code for CONFIG_SOC_DM646X and in u-boot-ti we have additional patches to support DA830 (which is CONFIG_SOC_DA8XX && !CONFIG_SOC_DA850). Resolve these conflicts manually and comment the #else/#endif lines for clarity. Conflicts: arch/arm/include/asm/arch-davinci/gpio.h drivers/gpio/da8xx_gpio.c Signed-off-by: Tom Rini <trini@ti.com>
|
/openbmc/u-boot/drivers/mmc/ |
H A D | sh_mmcif.c | 76b40ab4 Mon Mar 11 11:02:40 CDT 2013 Tom Rini <trini@ti.com> Merge u-boot/master into u-boot-ti/master In master we had already taken a patch to fix the davinci GPIO code for CONFIG_SOC_DM646X and in u-boot-ti we have additional patches to support DA830 (which is CONFIG_SOC_DA8XX && !CONFIG_SOC_DA850). Resolve these conflicts manually and comment the #else/#endif lines for clarity. Conflicts: arch/arm/include/asm/arch-davinci/gpio.h drivers/gpio/da8xx_gpio.c Signed-off-by: Tom Rini <trini@ti.com>
|
H A D | arm_pl180_mmci.c | 76b40ab4 Mon Mar 11 11:02:40 CDT 2013 Tom Rini <trini@ti.com> Merge u-boot/master into u-boot-ti/master In master we had already taken a patch to fix the davinci GPIO code for CONFIG_SOC_DM646X and in u-boot-ti we have additional patches to support DA830 (which is CONFIG_SOC_DA8XX && !CONFIG_SOC_DA850). Resolve these conflicts manually and comment the #else/#endif lines for clarity. Conflicts: arch/arm/include/asm/arch-davinci/gpio.h drivers/gpio/da8xx_gpio.c Signed-off-by: Tom Rini <trini@ti.com>
|
/openbmc/u-boot/fs/ubifs/ |
H A D | super.c | 76b40ab4 Mon Mar 11 11:02:40 CDT 2013 Tom Rini <trini@ti.com> Merge u-boot/master into u-boot-ti/master In master we had already taken a patch to fix the davinci GPIO code for CONFIG_SOC_DM646X and in u-boot-ti we have additional patches to support DA830 (which is CONFIG_SOC_DA8XX && !CONFIG_SOC_DA850). Resolve these conflicts manually and comment the #else/#endif lines for clarity. Conflicts: arch/arm/include/asm/arch-davinci/gpio.h drivers/gpio/da8xx_gpio.c Signed-off-by: Tom Rini <trini@ti.com>
|
H A D | ubifs.c | 76b40ab4 Mon Mar 11 11:02:40 CDT 2013 Tom Rini <trini@ti.com> Merge u-boot/master into u-boot-ti/master In master we had already taken a patch to fix the davinci GPIO code for CONFIG_SOC_DM646X and in u-boot-ti we have additional patches to support DA830 (which is CONFIG_SOC_DA8XX && !CONFIG_SOC_DA850). Resolve these conflicts manually and comment the #else/#endif lines for clarity. Conflicts: arch/arm/include/asm/arch-davinci/gpio.h drivers/gpio/da8xx_gpio.c Signed-off-by: Tom Rini <trini@ti.com>
|
/openbmc/u-boot/include/configs/ |
H A D | twister.h | 76b40ab4 Mon Mar 11 11:02:40 CDT 2013 Tom Rini <trini@ti.com> Merge u-boot/master into u-boot-ti/master In master we had already taken a patch to fix the davinci GPIO code for CONFIG_SOC_DM646X and in u-boot-ti we have additional patches to support DA830 (which is CONFIG_SOC_DA8XX && !CONFIG_SOC_DA850). Resolve these conflicts manually and comment the #else/#endif lines for clarity. Conflicts: arch/arm/include/asm/arch-davinci/gpio.h drivers/gpio/da8xx_gpio.c Signed-off-by: Tom Rini <trini@ti.com>
|
H A D | iconnect.h | 76b40ab4 Mon Mar 11 11:02:40 CDT 2013 Tom Rini <trini@ti.com> Merge u-boot/master into u-boot-ti/master In master we had already taken a patch to fix the davinci GPIO code for CONFIG_SOC_DM646X and in u-boot-ti we have additional patches to support DA830 (which is CONFIG_SOC_DA8XX && !CONFIG_SOC_DA850). Resolve these conflicts manually and comment the #else/#endif lines for clarity. Conflicts: arch/arm/include/asm/arch-davinci/gpio.h drivers/gpio/da8xx_gpio.c Signed-off-by: Tom Rini <trini@ti.com>
|
H A D | apx4devkit.h | 76b40ab4 Mon Mar 11 11:02:40 CDT 2013 Tom Rini <trini@ti.com> Merge u-boot/master into u-boot-ti/master In master we had already taken a patch to fix the davinci GPIO code for CONFIG_SOC_DM646X and in u-boot-ti we have additional patches to support DA830 (which is CONFIG_SOC_DA8XX && !CONFIG_SOC_DA850). Resolve these conflicts manually and comment the #else/#endif lines for clarity. Conflicts: arch/arm/include/asm/arch-davinci/gpio.h drivers/gpio/da8xx_gpio.c Signed-off-by: Tom Rini <trini@ti.com>
|
/openbmc/u-boot/board/keymile/km83xx/ |
H A D | km83xx.c | 76b40ab4 Mon Mar 11 11:02:40 CDT 2013 Tom Rini <trini@ti.com> Merge u-boot/master into u-boot-ti/master In master we had already taken a patch to fix the davinci GPIO code for CONFIG_SOC_DM646X and in u-boot-ti we have additional patches to support DA830 (which is CONFIG_SOC_DA8XX && !CONFIG_SOC_DA850). Resolve these conflicts manually and comment the #else/#endif lines for clarity. Conflicts: arch/arm/include/asm/arch-davinci/gpio.h drivers/gpio/da8xx_gpio.c Signed-off-by: Tom Rini <trini@ti.com>
|
/openbmc/u-boot/arch/sandbox/ |
H A D | config.mk | 76b40ab4 Mon Mar 11 11:02:40 CDT 2013 Tom Rini <trini@ti.com> Merge u-boot/master into u-boot-ti/master In master we had already taken a patch to fix the davinci GPIO code for CONFIG_SOC_DM646X and in u-boot-ti we have additional patches to support DA830 (which is CONFIG_SOC_DA8XX && !CONFIG_SOC_DA850). Resolve these conflicts manually and comment the #else/#endif lines for clarity. Conflicts: arch/arm/include/asm/arch-davinci/gpio.h drivers/gpio/da8xx_gpio.c Signed-off-by: Tom Rini <trini@ti.com>
|
/openbmc/u-boot/include/ |
H A D | fs.h | 76b40ab4 Mon Mar 11 11:02:40 CDT 2013 Tom Rini <trini@ti.com> Merge u-boot/master into u-boot-ti/master In master we had already taken a patch to fix the davinci GPIO code for CONFIG_SOC_DM646X and in u-boot-ti we have additional patches to support DA830 (which is CONFIG_SOC_DA8XX && !CONFIG_SOC_DA850). Resolve these conflicts manually and comment the #else/#endif lines for clarity. Conflicts: arch/arm/include/asm/arch-davinci/gpio.h drivers/gpio/da8xx_gpio.c Signed-off-by: Tom Rini <trini@ti.com>
|
H A D | ext4fs.h | 76b40ab4 Mon Mar 11 11:02:40 CDT 2013 Tom Rini <trini@ti.com> Merge u-boot/master into u-boot-ti/master In master we had already taken a patch to fix the davinci GPIO code for CONFIG_SOC_DM646X and in u-boot-ti we have additional patches to support DA830 (which is CONFIG_SOC_DA8XX && !CONFIG_SOC_DA850). Resolve these conflicts manually and comment the #else/#endif lines for clarity. Conflicts: arch/arm/include/asm/arch-davinci/gpio.h drivers/gpio/da8xx_gpio.c Signed-off-by: Tom Rini <trini@ti.com>
|
H A D | exports.h | 76b40ab4 Mon Mar 11 11:02:40 CDT 2013 Tom Rini <trini@ti.com> Merge u-boot/master into u-boot-ti/master In master we had already taken a patch to fix the davinci GPIO code for CONFIG_SOC_DM646X and in u-boot-ti we have additional patches to support DA830 (which is CONFIG_SOC_DA8XX && !CONFIG_SOC_DA850). Resolve these conflicts manually and comment the #else/#endif lines for clarity. Conflicts: arch/arm/include/asm/arch-davinci/gpio.h drivers/gpio/da8xx_gpio.c Signed-off-by: Tom Rini <trini@ti.com>
|
/openbmc/u-boot/board/ti/am3517crane/ |
H A D | am3517crane.c | 76b40ab4 Mon Mar 11 11:02:40 CDT 2013 Tom Rini <trini@ti.com> Merge u-boot/master into u-boot-ti/master In master we had already taken a patch to fix the davinci GPIO code for CONFIG_SOC_DM646X and in u-boot-ti we have additional patches to support DA830 (which is CONFIG_SOC_DA8XX && !CONFIG_SOC_DA850). Resolve these conflicts manually and comment the #else/#endif lines for clarity. Conflicts: arch/arm/include/asm/arch-davinci/gpio.h drivers/gpio/da8xx_gpio.c Signed-off-by: Tom Rini <trini@ti.com>
|
/openbmc/u-boot/arch/x86/lib/ |
H A D | init_helpers.c | 76b40ab4 Mon Mar 11 11:02:40 CDT 2013 Tom Rini <trini@ti.com> Merge u-boot/master into u-boot-ti/master In master we had already taken a patch to fix the davinci GPIO code for CONFIG_SOC_DM646X and in u-boot-ti we have additional patches to support DA830 (which is CONFIG_SOC_DA8XX && !CONFIG_SOC_DA850). Resolve these conflicts manually and comment the #else/#endif lines for clarity. Conflicts: arch/arm/include/asm/arch-davinci/gpio.h drivers/gpio/da8xx_gpio.c Signed-off-by: Tom Rini <trini@ti.com>
|
/openbmc/u-boot/board/pandora/ |
H A D | pandora.c | 76b40ab4 Mon Mar 11 11:02:40 CDT 2013 Tom Rini <trini@ti.com> Merge u-boot/master into u-boot-ti/master In master we had already taken a patch to fix the davinci GPIO code for CONFIG_SOC_DM646X and in u-boot-ti we have additional patches to support DA830 (which is CONFIG_SOC_DA8XX && !CONFIG_SOC_DA850). Resolve these conflicts manually and comment the #else/#endif lines for clarity. Conflicts: arch/arm/include/asm/arch-davinci/gpio.h drivers/gpio/da8xx_gpio.c Signed-off-by: Tom Rini <trini@ti.com>
|
/openbmc/u-boot/board/ti/dra7xx/ |
H A D | mux_data.h | 76b40ab4 Mon Mar 11 11:02:40 CDT 2013 Tom Rini <trini@ti.com> Merge u-boot/master into u-boot-ti/master In master we had already taken a patch to fix the davinci GPIO code for CONFIG_SOC_DM646X and in u-boot-ti we have additional patches to support DA830 (which is CONFIG_SOC_DA8XX && !CONFIG_SOC_DA850). Resolve these conflicts manually and comment the #else/#endif lines for clarity. Conflicts: arch/arm/include/asm/arch-davinci/gpio.h drivers/gpio/da8xx_gpio.c Signed-off-by: Tom Rini <trini@ti.com>
|
/openbmc/u-boot/board/htkw/mcx/ |
H A D | mcx.c | 76b40ab4 Mon Mar 11 11:02:40 CDT 2013 Tom Rini <trini@ti.com> Merge u-boot/master into u-boot-ti/master In master we had already taken a patch to fix the davinci GPIO code for CONFIG_SOC_DM646X and in u-boot-ti we have additional patches to support DA830 (which is CONFIG_SOC_DA8XX && !CONFIG_SOC_DA850). Resolve these conflicts manually and comment the #else/#endif lines for clarity. Conflicts: arch/arm/include/asm/arch-davinci/gpio.h drivers/gpio/da8xx_gpio.c Signed-off-by: Tom Rini <trini@ti.com>
|
/openbmc/u-boot/include/configs/km/ |
H A D | km83xx-common.h | 76b40ab4 Mon Mar 11 11:02:40 CDT 2013 Tom Rini <trini@ti.com> Merge u-boot/master into u-boot-ti/master In master we had already taken a patch to fix the davinci GPIO code for CONFIG_SOC_DM646X and in u-boot-ti we have additional patches to support DA830 (which is CONFIG_SOC_DA8XX && !CONFIG_SOC_DA850). Resolve these conflicts manually and comment the #else/#endif lines for clarity. Conflicts: arch/arm/include/asm/arch-davinci/gpio.h drivers/gpio/da8xx_gpio.c Signed-off-by: Tom Rini <trini@ti.com>
|