Skip to contentSkip to conversation

Please pull u-boot-sunxi master

U-Boot Hans de Goede 3 participants 7 messages Nov 25, 2014 – Nov 27, 2014

lore
Share & tools
lore
#0 lore raw

Hi Tom,

Please pull u-boot-sunxi/master into master, highlights:

1) hdmi console (with usb keyboard) support with simplefb support so the kernel can use the framebuffer too
2) GMAC support for sun6i
3) A couple of small bugfixes

Note I've done a rebase + forced-push, as things were becoming a bit messy while merging.

The following changes since commit 2a82ec77d27ef5f860a107c4b764643a655dceeb:

Prepare v2015.01-rc2 (2014-11-24 17:08:47 -0500)

are available in the git repository at:

http://git.denx.de/u-boot-sunxi.git master

for you to fetch changes up to b366fb92c3d118f97bb0f01fa9c40d253e70e12c:

sun7i: Set ARMV7_BOOT_SEC_DEFAULT when OLD_SUNXI_KERNEL_COMPAT is set (2014-11-25 13:38:46 +0100)

----------------------------------------------------------------
Hans de Goede (12):
sun4i: Rename dram_clk_cfg to dram_clk_gate
sunxi: Add video pll clock functions
sunxi: video: Add sun6i support
fdt_support: Add a fdt_setup_simplefb_node helper function common/lcd: Make lcd_dt_simplefb_configure_node use fdt_setup_simplefb_node
sunxi: Add usb keyboard Kconfig option
sunxi: ahci: Add a delay after enabling target power
sun6i: Correct Mele M9 Vbus gpio settings
sun6i: Add gmac support for sun6i boards
sun6i: Drop some "unknown magic" from dram init
sun7i: Drop CONFIG_ARMV7_PSCI_NR_CPUS
sun7i: Set ARMV7_BOOT_SEC_DEFAULT when OLD_SUNXI_KERNEL_COMPAT is set

Luc Verhaegen (2):
sunxi: video: Add cfb console driver for sunxi
sunxi: video: Add simplefb support

  arch/arm/cpu/armv7/sunxi/clock_sun4i.c        |  27 ++
  arch/arm/cpu/armv7/sunxi/clock_sun6i.c        |  29 ++
  arch/arm/cpu/armv7/sunxi/dram_sun4i.c         |   4 +-
  arch/arm/cpu/armv7/sunxi/dram_sun6i.c         |   3 -
  arch/arm/include/asm/arch-sunxi/clock.h       |   2 +
  arch/arm/include/asm/arch-sunxi/clock_sun4i.h |  47 ++-
  arch/arm/include/asm/arch-sunxi/clock_sun6i.h |  67 +++-
  arch/arm/include/asm/arch-sunxi/cpu.h         |   4 +
  arch/arm/include/asm/arch-sunxi/display.h     | 187 +++++++++++
  arch/arm/include/asm/arch-sunxi/gpio.h        |   1 +
  board/sunxi/Kconfig                           |  15 +
  board/sunxi/ahci.c                            |   2 +
  board/sunxi/board.c                           |  10 +
  board/sunxi/gmac.c                            |  45 +++
  common/fdt_support.c                          |  62 ++++
  common/lcd.c                                  |  47 +--
  configs/A13-OLinuXinoM_defconfig              |   2 +
  configs/A13-OLinuXino_defconfig               |   2 +
  configs/Colombus_defconfig                    |   1 +
  configs/Ippo_q8h_v5_defconfig                 |   2 +
  configs/Mele_M9_defconfig                     |   8 +-
  drivers/video/Makefile                        |   1 +
  drivers/video/sunxi_display.c                 | 451 ++++++++++++++++++++++++++
  include/configs/sun7i.h                       |   1 -
  include/configs/sunxi-common.h                |  62 ++++
  include/fdt_support.h                         |   3 +
  26 files changed, 1032 insertions(+), 53 deletions(-)

create mode 100644 arch/arm/include/asm/arch-sunxi/display.h create mode 100644 drivers/video/sunxi_display.c

Regards,

Hans

#1 lore raw

Hi Tom,

Quoted 26 lines · Hans de Goede

Hi Tom,

Please pull u-boot-sunxi/master into master, highlights:

1) hdmi console (with usb keyboard) support with simplefb support so the kernel
can use the framebuffer too
2) GMAC support for sun6i
3) A couple of small bugfixes

Note I've done a rebase + forced-push, as things were becoming a bit messy while merging.

The following changes since commit 2a82ec77d27ef5f860a107c4b764643a655dceeb:

Prepare v2015.01-rc2 (2014-11-24 17:08:47 -0500)

are available in the git repository at:

http://git.denx.de/u-boot-sunxi.git master

for you to fetch changes up to b366fb92c3d118f97bb0f01fa9c40d253e70e12c:

sun7i: Set ARMV7_BOOT_SEC_DEFAULT when OLD_SUNXI_KERNEL_COMPAT is set
(2014-11-25 13:38:46 +0100)

Quoted 15 lines

----------------------------------------------------------------
Hans de Goede (12):
sun4i: Rename dram_clk_cfg to dram_clk_gate
sunxi: Add video pll clock functions
sunxi: video: Add sun6i support
fdt_support: Add a fdt_setup_simplefb_node helper function common/lcd: Make lcd_dt_simplefb_configure_node use
fdt_setup_simplefb_node
sunxi: Add usb keyboard Kconfig option
sunxi: ahci: Add a delay after enabling target power
sun6i: Correct Mele M9 Vbus gpio settings
sun6i: Add gmac support for sun6i boards
sun6i: Drop some "unknown magic" from dram init
sun7i: Drop CONFIG_ARMV7_PSCI_NR_CPUS
sun7i: Set ARMV7_BOOT_SEC_DEFAULT when OLD_SUNXI_KERNEL_COMPAT is set

The u-boot-fdt pull request is pending. I think it might have a slight conflict with this one, so I'll wait until this goes in and then resend the fdt pull request.

Regards,
Simon

#2 lore raw
Quoted 45 lines · Simon Glass

Hi Tom,

Quoted 26 lines · Hans de Goede

Hi Tom,

Please pull u-boot-sunxi/master into master, highlights:

1) hdmi console (with usb keyboard) support with simplefb support so the kernel
can use the framebuffer too
2) GMAC support for sun6i
3) A couple of small bugfixes

Note I've done a rebase + forced-push, as things were becoming a bit messy while merging.

The following changes since commit 2a82ec77d27ef5f860a107c4b764643a655dceeb:

Prepare v2015.01-rc2 (2014-11-24 17:08:47 -0500)

are available in the git repository at:

http://git.denx.de/u-boot-sunxi.git master

for you to fetch changes up to b366fb92c3d118f97bb0f01fa9c40d253e70e12c:

sun7i: Set ARMV7_BOOT_SEC_DEFAULT when OLD_SUNXI_KERNEL_COMPAT is set
(2014-11-25 13:38:46 +0100)

Quoted 15 lines

----------------------------------------------------------------
Hans de Goede (12):
sun4i: Rename dram_clk_cfg to dram_clk_gate
sunxi: Add video pll clock functions
sunxi: video: Add sun6i support
fdt_support: Add a fdt_setup_simplefb_node helper function common/lcd: Make lcd_dt_simplefb_configure_node use
fdt_setup_simplefb_node
sunxi: Add usb keyboard Kconfig option
sunxi: ahci: Add a delay after enabling target power
sun6i: Correct Mele M9 Vbus gpio settings
sun6i: Add gmac support for sun6i boards
sun6i: Drop some "unknown magic" from dram init
sun7i: Drop CONFIG_ARMV7_PSCI_NR_CPUS
sun7i: Set ARMV7_BOOT_SEC_DEFAULT when OLD_SUNXI_KERNEL_COMPAT is set

Quoted 3 lines

The u-boot-fdt pull request is pending. I think it might have a slight conflict with this one, so I'll wait until this goes in and then resend the fdt pull request.

I _think_ I resolved the conflict right.

Signature · 8 lines
Tom
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 836 bytes
Desc: Digital signature
URL: <http://lists.denx.de/pipermail/u-boot/attachments/20141125/1002f620/attachment.pgp>
#3 lore raw

Hi,

Quoted 46 lines · Tom Rini
Quoted 45 lines · Simon Glass

Hi Tom,

Quoted 41 lines · Hans de Goede

Hi Tom,

Please pull u-boot-sunxi/master into master, highlights:

1) hdmi console (with usb keyboard) support with simplefb support so the kernel
can use the framebuffer too
2) GMAC support for sun6i
3) A couple of small bugfixes

Note I've done a rebase + forced-push, as things were becoming a bit messy while merging.

The following changes since commit 2a82ec77d27ef5f860a107c4b764643a655dceeb:

   Prepare v2015.01-rc2 (2014-11-24 17:08:47 -0500)

are available in the git repository at:

http://git.denx.de/u-boot-sunxi.git master

for you to fetch changes up to b366fb92c3d118f97bb0f01fa9c40d253e70e12c:

sun7i: Set ARMV7_BOOT_SEC_DEFAULT when OLD_SUNXI_KERNEL_COMPAT is set
(2014-11-25 13:38:46 +0100)

----------------------------------------------------------------
Hans de Goede (12):
sun4i: Rename dram_clk_cfg to dram_clk_gate
sunxi: Add video pll clock functions
sunxi: video: Add sun6i support
fdt_support: Add a fdt_setup_simplefb_node helper function common/lcd: Make lcd_dt_simplefb_configure_node use
fdt_setup_simplefb_node
sunxi: Add usb keyboard Kconfig option
sunxi: ahci: Add a delay after enabling target power
sun6i: Correct Mele M9 Vbus gpio settings
sun6i: Add gmac support for sun6i boards
sun6i: Drop some "unknown magic" from dram init
sun7i: Drop CONFIG_ARMV7_PSCI_NR_CPUS
sun7i: Set ARMV7_BOOT_SEC_DEFAULT when OLD_SUNXI_KERNEL_COMPAT is set

Quoted 5 lines
Quoted 3 lines

The u-boot-fdt pull request is pending. I think it might have a slight conflict with this one, so I'll wait until this goes in and then resend the fdt pull request.

I _think_ I resolved the conflict right.

Hmm, I'm not seeing any changes if I do a "git remote update" did you perhaps forget to push things ?

Thanks & Regards,

Hans

#4 lore raw
Quoted 49 lines · Hans de Goede

Hi,

Quoted 46 lines · Tom Rini
Quoted 45 lines · Simon Glass

Hi Tom,

Quoted 41 lines · Hans de Goede

Hi Tom,

Please pull u-boot-sunxi/master into master, highlights:

1) hdmi console (with usb keyboard) support with simplefb support so the kernel
can use the framebuffer too
2) GMAC support for sun6i
3) A couple of small bugfixes

Note I've done a rebase + forced-push, as things were becoming a bit messy while merging.

The following changes since commit 2a82ec77d27ef5f860a107c4b764643a655dceeb:

Prepare v2015.01-rc2 (2014-11-24 17:08:47 -0500)

are available in the git repository at:

http://git.denx.de/u-boot-sunxi.git master

for you to fetch changes up to b366fb92c3d118f97bb0f01fa9c40d253e70e12c:

sun7i: Set ARMV7_BOOT_SEC_DEFAULT when OLD_SUNXI_KERNEL_COMPAT is set
(2014-11-25 13:38:46 +0100)

----------------------------------------------------------------
Hans de Goede (12):
sun4i: Rename dram_clk_cfg to dram_clk_gate
sunxi: Add video pll clock functions
sunxi: video: Add sun6i support
fdt_support: Add a fdt_setup_simplefb_node helper function common/lcd: Make lcd_dt_simplefb_configure_node use
fdt_setup_simplefb_node
sunxi: Add usb keyboard Kconfig option
sunxi: ahci: Add a delay after enabling target power
sun6i: Correct Mele M9 Vbus gpio settings
sun6i: Add gmac support for sun6i boards
sun6i: Drop some "unknown magic" from dram init
sun7i: Drop CONFIG_ARMV7_PSCI_NR_CPUS
sun7i: Set ARMV7_BOOT_SEC_DEFAULT when OLD_SUNXI_KERNEL_COMPAT is set

Quoted 8 lines
Quoted 5 lines
Quoted 3 lines

The u-boot-fdt pull request is pending. I think it might have a slight conflict with this one, so I'll wait until this goes in and then resend the fdt pull request.

I _think_ I resolved the conflict right.

Hmm, I'm not seeing any changes if I do a "git remote update" did you perhaps forget to push things ?

Ah sorry. To be clear, I was testing things at the time :)

Signature · 8 lines
Tom
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 836 bytes
Desc: Digital signature
URL: <http://lists.denx.de/pipermail/u-boot/attachments/20141126/ddca5979/attachment.pgp>
#5 lore raw

Hi,

Quoted 54 lines · Tom Rini
Quoted 53 lines · Hans de Goede

Hi,

Quoted 50 lines · Tom Rini
Quoted 48 lines · Simon Glass

Hi Tom,

Quoted 26 lines · Hans de Goede

Hi Tom,

Please pull u-boot-sunxi/master into master, highlights:

1) hdmi console (with usb keyboard) support with simplefb support so the kernel
can use the framebuffer too
2) GMAC support for sun6i
3) A couple of small bugfixes

Note I've done a rebase + forced-push, as things were becoming a bit messy while merging.

The following changes since commit 2a82ec77d27ef5f860a107c4b764643a655dceeb:

   Prepare v2015.01-rc2 (2014-11-24 17:08:47 -0500)

are available in the git repository at:

http://git.denx.de/u-boot-sunxi.git master

for you to fetch changes up to b366fb92c3d118f97bb0f01fa9c40d253e70e12c:

sun7i: Set ARMV7_BOOT_SEC_DEFAULT when OLD_SUNXI_KERNEL_COMPAT is set
(2014-11-25 13:38:46 +0100)

Quoted 15 lines

----------------------------------------------------------------
Hans de Goede (12):
sun4i: Rename dram_clk_cfg to dram_clk_gate
sunxi: Add video pll clock functions
sunxi: video: Add sun6i support
fdt_support: Add a fdt_setup_simplefb_node helper function common/lcd: Make lcd_dt_simplefb_configure_node use
fdt_setup_simplefb_node
sunxi: Add usb keyboard Kconfig option
sunxi: ahci: Add a delay after enabling target power
sun6i: Correct Mele M9 Vbus gpio settings
sun6i: Add gmac support for sun6i boards
sun6i: Drop some "unknown magic" from dram init
sun7i: Drop CONFIG_ARMV7_PSCI_NR_CPUS
sun7i: Set ARMV7_BOOT_SEC_DEFAULT when OLD_SUNXI_KERNEL_COMPAT is set

The u-boot-fdt pull request is pending. I think it might have a slight conflict with this one, so I'll wait until this goes in and then resend the fdt pull request.

Quoted 6 lines
Quoted 4 lines
Quoted 1 line

I _think_ I resolved the conflict right.

Hmm, I'm not seeing any changes if I do a "git remote update" did you perhaps forget to push things ?

Ah sorry. To be clear, I was testing things at the time :)

Ah, ok. Thanks looks good now (have not tested it yet).

Regards,

Hans

#6 lore raw
In reply to Hans de Goede
Quoted 16 lines · Hans de Goede

Hi Tom,

Please pull u-boot-sunxi/master into master, highlights:

1) hdmi console (with usb keyboard) support with simplefb support so the kernel can use the framebuffer too
2) GMAC support for sun6i
3) A couple of small bugfixes

Note I've done a rebase + forced-push, as things were becoming a bit messy while merging.

The following changes since commit 2a82ec77d27ef5f860a107c4b764643a655dceeb:

Prepare v2015.01-rc2 (2014-11-24 17:08:47 -0500)

Quoted 8 lines

are available in the git repository at:

http://git.denx.de/u-boot-sunxi.git master

for you to fetch changes up to b366fb92c3d118f97bb0f01fa9c40d253e70e12c:

sun7i: Set ARMV7_BOOT_SEC_DEFAULT when OLD_SUNXI_KERNEL_COMPAT is set (2014-11-25 13:38:46 +0100)

Applied to u-boot/master, thanks!

Signature · 8 lines
Tom
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 836 bytes
Desc: Digital signature
URL: <http://lists.denx.de/pipermail/u-boot/attachments/20141126/f74d0f0b/attachment.pgp>