| /rk3399_rockchip-uboot/fs/sandbox/ |
| H A D | Makefile | 76b40ab41eff1f402ee52ba768b09daad293b9bb Mon Mar 11 16:02:40 UTC 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 | sandboxfs.c | 76b40ab41eff1f402ee52ba768b09daad293b9bb Mon Mar 11 16:02:40 UTC 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>
|
| /rk3399_rockchip-uboot/lib/ |
| H A D | crc32.c | 76b40ab41eff1f402ee52ba768b09daad293b9bb Mon Mar 11 16:02:40 UTC 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 | display_options.c | 76b40ab41eff1f402ee52ba768b09daad293b9bb Mon Mar 11 16:02:40 UTC 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>
|
| /rk3399_rockchip-uboot/board/timll/devkit8000/ |
| H A D | devkit8000.h | 76b40ab41eff1f402ee52ba768b09daad293b9bb Mon Mar 11 16:02:40 UTC 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>
|
| /rk3399_rockchip-uboot/doc/ |
| H A D | README.falcon | 76b40ab41eff1f402ee52ba768b09daad293b9bb Mon Mar 11 16:02:40 UTC 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>
|
| /rk3399_rockchip-uboot/include/ |
| H A D | sandboxfs.h | 76b40ab41eff1f402ee52ba768b09daad293b9bb Mon Mar 11 16:02:40 UTC 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 | malloc.h | 76b40ab41eff1f402ee52ba768b09daad293b9bb Mon Mar 11 16:02:40 UTC 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 | hash.h | 76b40ab41eff1f402ee52ba768b09daad293b9bb Mon Mar 11 16:02:40 UTC 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>
|
| /rk3399_rockchip-uboot/include/u-boot/ |
| H A D | crc.h | 76b40ab41eff1f402ee52ba768b09daad293b9bb Mon Mar 11 16:02:40 UTC 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>
|
| /rk3399_rockchip-uboot/board/keymile/scripts/ |
| H A D | ramfs-common.txt | 76b40ab41eff1f402ee52ba768b09daad293b9bb Mon Mar 11 16:02:40 UTC 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 | develop-common.txt | 76b40ab41eff1f402ee52ba768b09daad293b9bb Mon Mar 11 16:02:40 UTC 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>
|
| /rk3399_rockchip-uboot/fs/ext4/ |
| H A D | Makefile | 76b40ab41eff1f402ee52ba768b09daad293b9bb Mon Mar 11 16:02:40 UTC 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>
|
| /rk3399_rockchip-uboot/board/technexion/twister/ |
| H A D | twister.h | 76b40ab41eff1f402ee52ba768b09daad293b9bb Mon Mar 11 16:02:40 UTC 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>
|
| /rk3399_rockchip-uboot/include/configs/ |
| H A D | tuxx1.h | 76b40ab41eff1f402ee52ba768b09daad293b9bb Mon Mar 11 16:02:40 UTC 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 | km8360.h | 76b40ab41eff1f402ee52ba768b09daad293b9bb Mon Mar 11 16:02:40 UTC 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 | suvd3.h | 76b40ab41eff1f402ee52ba768b09daad293b9bb Mon Mar 11 16:02:40 UTC 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>
|
| /rk3399_rockchip-uboot/tools/env/ |
| H A D | fw_env.config | 76b40ab41eff1f402ee52ba768b09daad293b9bb Mon Mar 11 16:02:40 UTC 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>
|
| /rk3399_rockchip-uboot/include/configs/km/ |
| H A D | km8309-common.h | 76b40ab41eff1f402ee52ba768b09daad293b9bb Mon Mar 11 16:02:40 UTC 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 | km8321-common.h | 76b40ab41eff1f402ee52ba768b09daad293b9bb Mon Mar 11 16:02:40 UTC 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>
|
| /rk3399_rockchip-uboot/drivers/gpio/ |
| H A D | da8xx_gpio.c | 76b40ab41eff1f402ee52ba768b09daad293b9bb Mon Mar 11 16:02:40 UTC 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>
|
| /rk3399_rockchip-uboot/drivers/serial/ |
| H A D | sandbox.c | 76b40ab41eff1f402ee52ba768b09daad293b9bb Mon Mar 11 16:02:40 UTC 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>
|
| /rk3399_rockchip-uboot/arch/sandbox/include/asm/ |
| H A D | io.h | 76b40ab41eff1f402ee52ba768b09daad293b9bb Mon Mar 11 16:02:40 UTC 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>
|
| /rk3399_rockchip-uboot/arch/x86/lib/ |
| H A D | relocate.c | 76b40ab41eff1f402ee52ba768b09daad293b9bb Mon Mar 11 16:02:40 UTC 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>
|
| /rk3399_rockchip-uboot/board/keymile/common/ |
| H A D | ivm.c | 76b40ab41eff1f402ee52ba768b09daad293b9bb Mon Mar 11 16:02:40 UTC 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>
|