* Archos G9: barebox board env contains boot-entries-collect
@ 2015-09-24 8:58 Antony Pavlov
2015-09-25 22:41 ` [PATCH 0/3] ArchosG9 updates Vicente Bergas
` (3 more replies)
0 siblings, 4 replies; 6+ messages in thread
From: Antony Pavlov @ 2015-09-24 8:58 UTC (permalink / raw)
To: Vicente Bergas; +Cc: barebox
Hi Vicente!
In the current next branch Archos G9 board env contains boot-entries-collect call.
But the boot-entries-collect script was dropped by this commit.
commit 294dc7160e55ffb6b940045fb00f01697dacd660
Author: Sascha Hauer <s.hauer@pengutronix.de>
Date: Wed Sep 25 07:22:23 2013 +0200
defenv-2: replace menu with menutree
--
Best regards,
Antony Pavlov
_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox
^ permalink raw reply [flat|nested] 6+ messages in thread
* [PATCH 0/3] ArchosG9 updates.
2015-09-24 8:58 Archos G9: barebox board env contains boot-entries-collect Antony Pavlov
@ 2015-09-25 22:41 ` Vicente Bergas
2015-09-29 6:40 ` Sascha Hauer
2015-09-25 22:41 ` [PATCH 1/3] archosg9: re-generate defconfigs with "make savedefconfig" Vicente Bergas
` (2 subsequent siblings)
3 siblings, 1 reply; 6+ messages in thread
From: Vicente Bergas @ 2015-09-25 22:41 UTC (permalink / raw)
To: Antony Pavlov; +Cc: barebox, Vicente Bergas
Hello,
This series of patches contain updates to the ArchosG9 code.
The first one is just regenerating the *_defconfig with "make savedefconfig"
The second fixes the issue spotted by Antony Pavlov.
The third adds the display. I had that change forgotten somewhere and
thought that it would be better to share it.
By the way, while checking the patches with "scripts/checkpatch.pl" the script
itself reported several 'Unescaped left brace in regex is deprecated' warnings.
The perl version is v5.22.0.
Regards,
Vicente.
Vicente Bergas (3):
archosg9: re-generate defconfigs with "make savedefconfig"
archosg9: Use defaultenv-2-menu
archosg9: add display
arch/arm/boards/archosg9/board.c | 111 +++++++++++++++++++--
arch/arm/boards/archosg9/env/bin/init | 28 ------
arch/arm/boards/archosg9/env/init/automount | 28 ------
arch/arm/boards/archosg9/env/init/automount2 | 7 ++
arch/arm/boards/archosg9/env/init/splash | 5 +
.../boards/archosg9/env/menu/11-boot-flash/action | 4 +
.../boards/archosg9/env/menu/11-boot-flash/title | 1 +
.../arm/boards/archosg9/env/menu/12-boot-sd/action | 4 +
arch/arm/boards/archosg9/env/menu/12-boot-sd/title | 1 +
.../boards/archosg9/env/menu/13-boot-usb/action | 4 +
.../arm/boards/archosg9/env/menu/13-boot-usb/title | 1 +
arch/arm/boards/archosg9/env/menu/mainmenu | 25 -----
arch/arm/boards/archosg9/mux.c | 20 ++--
arch/arm/configs/archosg9_defconfig | 68 +++++++------
arch/arm/configs/archosg9_xload_defconfig | 4 -
15 files changed, 174 insertions(+), 137 deletions(-)
delete mode 100644 arch/arm/boards/archosg9/env/bin/init
delete mode 100644 arch/arm/boards/archosg9/env/init/automount
create mode 100644 arch/arm/boards/archosg9/env/init/automount2
create mode 100644 arch/arm/boards/archosg9/env/init/splash
create mode 100644 arch/arm/boards/archosg9/env/menu/11-boot-flash/action
create mode 100644 arch/arm/boards/archosg9/env/menu/11-boot-flash/title
create mode 100644 arch/arm/boards/archosg9/env/menu/12-boot-sd/action
create mode 100644 arch/arm/boards/archosg9/env/menu/12-boot-sd/title
create mode 100644 arch/arm/boards/archosg9/env/menu/13-boot-usb/action
create mode 100644 arch/arm/boards/archosg9/env/menu/13-boot-usb/title
delete mode 100644 arch/arm/boards/archosg9/env/menu/mainmenu
--
2.5.3
_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox
^ permalink raw reply [flat|nested] 6+ messages in thread
* [PATCH 1/3] archosg9: re-generate defconfigs with "make savedefconfig"
2015-09-24 8:58 Archos G9: barebox board env contains boot-entries-collect Antony Pavlov
2015-09-25 22:41 ` [PATCH 0/3] ArchosG9 updates Vicente Bergas
@ 2015-09-25 22:41 ` Vicente Bergas
2015-09-25 22:41 ` [PATCH 2/3] archosg9: Use defaultenv-2-menu Vicente Bergas
2015-09-25 22:41 ` [PATCH 3/3] archosg9: add display Vicente Bergas
3 siblings, 0 replies; 6+ messages in thread
From: Vicente Bergas @ 2015-09-25 22:41 UTC (permalink / raw)
To: Antony Pavlov; +Cc: barebox, Vicente Bergas
Signed-off-by: Vicente Bergas <vicencb@gmail.com>
---
arch/arm/configs/archosg9_defconfig | 60 +++++++++++++++----------------
arch/arm/configs/archosg9_xload_defconfig | 4 ---
2 files changed, 28 insertions(+), 36 deletions(-)
diff --git a/arch/arm/configs/archosg9_defconfig b/arch/arm/configs/archosg9_defconfig
index 66fbf1a..c870209 100644
--- a/arch/arm/configs/archosg9_defconfig
+++ b/arch/arm/configs/archosg9_defconfig
@@ -1,19 +1,15 @@
CONFIG_ARCH_OMAP=y
-CONFIG_ARCH_OMAP4=y
CONFIG_OMAP4_USBBOOT=y
CONFIG_MACH_ARCHOSG9=y
CONFIG_THUMB2_BAREBOX=y
CONFIG_ARM_BOARD_APPEND_ATAG=y
-CONFIG_CMD_ARM_MMUINFO=y
CONFIG_ARM_OPTIMZED_STRING_FUNCTIONS=y
CONFIG_ARM_UNWIND=y
-# CONFIG_MMU is not set
CONFIG_TEXT_BASE=0x8f000000
CONFIG_MALLOC_SIZE=0x2000000
CONFIG_MALLOC_TLSF=y
CONFIG_KALLSYMS=y
CONFIG_PROMPT="barebox> "
-CONFIG_LONGHELP=y
CONFIG_HUSH_FANCY_PROMPT=y
CONFIG_CMDLINE_EDITING=y
CONFIG_AUTO_COMPLETE=y
@@ -22,51 +18,51 @@ CONFIG_MENU=y
CONFIG_CONSOLE_ACTIVATE_ALL=y
CONFIG_DEFAULT_ENVIRONMENT_GENERIC_NEW=y
CONFIG_DEFAULT_ENVIRONMENT_PATH="arch/arm/boards/archosg9/env"
-CONFIG_CMD_EDIT=y
-CONFIG_CMD_SLEEP=y
-CONFIG_CMD_MSLEEP=y
-CONFIG_CMD_SAVEENV=y
-CONFIG_CMD_EXPORT=y
-CONFIG_CMD_PRINTENV=y
-CONFIG_CMD_READLINE=y
-CONFIG_CMD_MENU=y
-CONFIG_CMD_MENU_MANAGEMENT=y
-CONFIG_CMD_TIME=y
-CONFIG_CMD_DIRNAME=y
-CONFIG_CMD_LN=y
-CONFIG_CMD_READLINK=y
-CONFIG_CMD_TFTP=y
-CONFIG_CMD_ECHO_E=y
-CONFIG_CMD_MEMINFO=y
+CONFIG_LONGHELP=y
CONFIG_CMD_IOMEM=y
-CONFIG_CMD_CRC=y
-CONFIG_CMD_CRC_CMP=y
-CONFIG_CMD_MD5SUM=y
-CONFIG_CMD_FLASH=y
+CONFIG_CMD_MEMINFO=y
+CONFIG_CMD_ARM_MMUINFO=y
+CONFIG_CMD_BOOT_ORDER=y
CONFIG_CMD_BOOTM_SHOW_TYPE=y
CONFIG_CMD_BOOTM_VERBOSE=y
CONFIG_CMD_BOOTM_INITRD=y
CONFIG_CMD_BOOTM_OFTREE=y
CONFIG_CMD_BOOTM_OFTREE_UIMAGE=y
CONFIG_CMD_BOOTM_AIMAGE=y
-CONFIG_CMD_UIMAGE=y
# CONFIG_CMD_BOOTU is not set
-CONFIG_CMD_RESET=y
-CONFIG_CMD_BOOT_ORDER=y
CONFIG_CMD_GO=y
-CONFIG_CMD_TIMEOUT=y
+CONFIG_CMD_RESET=y
+CONFIG_CMD_UIMAGE=y
CONFIG_CMD_PARTITION=y
+CONFIG_CMD_EXPORT=y
+CONFIG_CMD_PRINTENV=y
CONFIG_CMD_MAGICVAR=y
CONFIG_CMD_MAGICVAR_HELP=y
-CONFIG_CMD_GPIO=y
+CONFIG_CMD_SAVEENV=y
+CONFIG_CMD_LN=y
+CONFIG_CMD_MD5SUM=y
CONFIG_CMD_UNCOMPRESS=y
+CONFIG_CMD_MSLEEP=y
+CONFIG_CMD_SLEEP=y
+CONFIG_CMD_DHCP=y
+CONFIG_CMD_MIITOOL=y
+CONFIG_CMD_PING=y
+CONFIG_CMD_TFTP=y
+CONFIG_CMD_ECHO_E=y
+CONFIG_CMD_EDIT=y
+CONFIG_CMD_MENU=y
+CONFIG_CMD_MENU_MANAGEMENT=y
+CONFIG_CMD_READLINE=y
+CONFIG_CMD_TIMEOUT=y
+CONFIG_CMD_CRC=y
+CONFIG_CMD_CRC_CMP=y
+CONFIG_CMD_FLASH=y
+CONFIG_CMD_GPIO=y
CONFIG_CMD_I2C=y
CONFIG_CMD_LED=y
CONFIG_CMD_LED_TRIGGER=y
-CONFIG_CMD_MIITOOL=y
+CONFIG_CMD_TIME=y
CONFIG_NET=y
-CONFIG_CMD_DHCP=y
-CONFIG_CMD_PING=y
CONFIG_NET_NETCONSOLE=y
CONFIG_NET_RESOLV=y
CONFIG_DRIVER_SERIAL_NS16550=y
diff --git a/arch/arm/configs/archosg9_xload_defconfig b/arch/arm/configs/archosg9_xload_defconfig
index 24369b2..9660213 100644
--- a/arch/arm/configs/archosg9_xload_defconfig
+++ b/arch/arm/configs/archosg9_xload_defconfig
@@ -1,13 +1,10 @@
CONFIG_ARCH_OMAP=y
CONFIG_BAREBOX_MAX_IMAGE_SIZE=0xC000
-CONFIG_ARCH_OMAP4=y
# CONFIG_OMAP_GPMC is not set
CONFIG_OMAP_BUILD_IFT=y
CONFIG_OMAP4_USBBOOT=y
CONFIG_MACH_ARCHOSG9=y
CONFIG_THUMB2_BAREBOX=y
-# CONFIG_CMD_ARM_CPUINFO is not set
-# CONFIG_MMU is not set
# CONFIG_BANNER is not set
# CONFIG_MEMINFO is not set
CONFIG_TEXT_BASE=0x40300000
@@ -21,7 +18,6 @@ CONFIG_DRIVER_SERIAL_NS16550=y
CONFIG_DRIVER_SERIAL_NS16550_OMAP_EXTENSIONS=y
CONFIG_DRIVER_SERIAL_OMAP4_USBBOOT=y
# CONFIG_SPI is not set
-# CONFIG_DISK_WRITE is not set
CONFIG_MCI=y
CONFIG_MCI_STARTUP=y
# CONFIG_MCI_WRITE is not set
--
2.5.3
_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox
^ permalink raw reply [flat|nested] 6+ messages in thread
* [PATCH 2/3] archosg9: Use defaultenv-2-menu
2015-09-24 8:58 Archos G9: barebox board env contains boot-entries-collect Antony Pavlov
2015-09-25 22:41 ` [PATCH 0/3] ArchosG9 updates Vicente Bergas
2015-09-25 22:41 ` [PATCH 1/3] archosg9: re-generate defconfigs with "make savedefconfig" Vicente Bergas
@ 2015-09-25 22:41 ` Vicente Bergas
2015-09-25 22:41 ` [PATCH 3/3] archosg9: add display Vicente Bergas
3 siblings, 0 replies; 6+ messages in thread
From: Vicente Bergas @ 2015-09-25 22:41 UTC (permalink / raw)
To: Antony Pavlov; +Cc: barebox, Vicente Bergas
Signed-off-by: Vicente Bergas <vicencb@gmail.com>
---
arch/arm/boards/archosg9/env/bin/init | 28 ----------------------
arch/arm/boards/archosg9/env/init/automount | 28 ----------------------
arch/arm/boards/archosg9/env/init/automount2 | 7 ++++++
| 4 ++++
| 1 +
| 4 ++++
| 1 +
| 4 ++++
| 1 +
arch/arm/boards/archosg9/env/menu/mainmenu | 25 -------------------
arch/arm/configs/archosg9_defconfig | 1 +
11 files changed, 23 insertions(+), 81 deletions(-)
delete mode 100644 arch/arm/boards/archosg9/env/bin/init
delete mode 100644 arch/arm/boards/archosg9/env/init/automount
create mode 100644 arch/arm/boards/archosg9/env/init/automount2
create mode 100644 arch/arm/boards/archosg9/env/menu/11-boot-flash/action
create mode 100644 arch/arm/boards/archosg9/env/menu/11-boot-flash/title
create mode 100644 arch/arm/boards/archosg9/env/menu/12-boot-sd/action
create mode 100644 arch/arm/boards/archosg9/env/menu/12-boot-sd/title
create mode 100644 arch/arm/boards/archosg9/env/menu/13-boot-usb/action
create mode 100644 arch/arm/boards/archosg9/env/menu/13-boot-usb/title
delete mode 100644 arch/arm/boards/archosg9/env/menu/mainmenu
diff --git a/arch/arm/boards/archosg9/env/bin/init b/arch/arm/boards/archosg9/env/bin/init
deleted file mode 100644
index 0b36299..0000000
--- a/arch/arm/boards/archosg9/env/bin/init
+++ /dev/null
@@ -1,28 +0,0 @@
-#!/bin/sh
-
-export PATH=/env/bin
-
-global hostname=generic
-global user=none
-global boot.default=net
-global allow_color=true
-global linux.bootargs.base
-#linux.bootargs.dyn.* will be cleared at the beginning of boot
-global linux.bootargs.dyn.ip
-global linux.bootargs.dyn.root
-global editcmd=sedit
-
-/env/config
-
-timeout -s -a 0
-autoboot="$?"
-
-for i in /env/init/*; do
- . $i
-done
-
-if [ "$autoboot" = 0 ]; then
- boot
-fi
-
-/env/menu/mainmenu
diff --git a/arch/arm/boards/archosg9/env/init/automount b/arch/arm/boards/archosg9/env/init/automount
deleted file mode 100644
index 700b5e4..0000000
--- a/arch/arm/boards/archosg9/env/init/automount
+++ /dev/null
@@ -1,28 +0,0 @@
-#!/bin/sh
-
-if [ "$1" = menu ]; then
- init-menu-add-entry "$0" "Automountpoints"
- exit
-fi
-
-# automount tftp server based on $eth0.serverip
-
-mkdir -p /mnt/tftp
-automount /mnt/tftp 'ifup eth0 && mount -t tftp $eth0.serverip /mnt/tftp'
-
-# automount nfs server example
-
-#nfshost=somehost
-#mkdir -p /mnt/${nfshost}
-#automount /mnt/$nfshost "ifup eth0 && mount -t nfs ${nfshost}:/tftpboot /mnt/${nfshost}"
-
-# FAT on usb disk example
-
-#mkdir -p /mnt/fat
-#automount -d /mnt/fat 'usb && [ -e /dev/disk0.0 ] && mount /dev/disk0.0 /mnt/fat'
-
-mkdir -p /mnt/sd
-automount -d /mnt/sd 'mount /dev/disk0.0 /mnt/sd'
-
-mkdir -p /mnt/usb
-automount -d /mnt/usb 'mount -t omap4_usbbootfs omap4_usbboot /mnt/usb'
diff --git a/arch/arm/boards/archosg9/env/init/automount2 b/arch/arm/boards/archosg9/env/init/automount2
new file mode 100644
index 0000000..fa10439
--- /dev/null
+++ b/arch/arm/boards/archosg9/env/init/automount2
@@ -0,0 +1,7 @@
+#!/bin/sh
+
+mkdir -p /mnt/sd
+automount -d /mnt/sd '[ -e /dev/disk0.0 ] && mount /dev/disk0.0 /mnt/sd'
+
+mkdir -p /mnt/usb
+automount -d /mnt/usb 'mount -t omap4_usbbootfs omap4_usbboot /mnt/usb'
diff --git a/arch/arm/boards/archosg9/env/menu/11-boot-flash/action b/arch/arm/boards/archosg9/env/menu/11-boot-flash/action
new file mode 100644
index 0000000..f83028b
--- /dev/null
+++ b/arch/arm/boards/archosg9/env/menu/11-boot-flash/action
@@ -0,0 +1,4 @@
+#!/bin/sh
+boot_order mmc2_1
+echo "Rebooting into internal flash..."
+reset
diff --git a/arch/arm/boards/archosg9/env/menu/11-boot-flash/title b/arch/arm/boards/archosg9/env/menu/11-boot-flash/title
new file mode 100644
index 0000000..2628b5a
--- /dev/null
+++ b/arch/arm/boards/archosg9/env/menu/11-boot-flash/title
@@ -0,0 +1 @@
+${RED}Reboot into internal flash${NC}
diff --git a/arch/arm/boards/archosg9/env/menu/12-boot-sd/action b/arch/arm/boards/archosg9/env/menu/12-boot-sd/action
new file mode 100644
index 0000000..19bc3ff
--- /dev/null
+++ b/arch/arm/boards/archosg9/env/menu/12-boot-sd/action
@@ -0,0 +1,4 @@
+#!/bin/sh
+boot_order mmc1
+echo "Rebooting into SD card..."
+reset
--git a/arch/arm/boards/archosg9/env/menu/12-boot-sd/title b/arch/arm/boards/archosg9/env/menu/12-boot-sd/title
new file mode 100644
index 0000000..92e940f
--- /dev/null
+++ b/arch/arm/boards/archosg9/env/menu/12-boot-sd/title
@@ -0,0 +1 @@
+${RED}Reboot into SD card${NC}
diff --git a/arch/arm/boards/archosg9/env/menu/13-boot-usb/action b/arch/arm/boards/archosg9/env/menu/13-boot-usb/action
new file mode 100644
index 0000000..885acba
--- /dev/null
+++ b/arch/arm/boards/archosg9/env/menu/13-boot-usb/action
@@ -0,0 +1,4 @@
+#!/bin/sh
+boot_order usb_1
+echo "Rebooting over usb..."
+reset
diff --git a/arch/arm/boards/archosg9/env/menu/13-boot-usb/title b/arch/arm/boards/archosg9/env/menu/13-boot-usb/title
new file mode 100644
index 0000000..76edccd
--- /dev/null
+++ b/arch/arm/boards/archosg9/env/menu/13-boot-usb/title
@@ -0,0 +1 @@
+${RED}Reboot over usb${NC}
diff --git a/arch/arm/boards/archosg9/env/menu/mainmenu b/arch/arm/boards/archosg9/env/menu/mainmenu
deleted file mode 100644
index 6856261..0000000
--- a/arch/arm/boards/archosg9/env/menu/mainmenu
+++ /dev/null
@@ -1,25 +0,0 @@
-#!/bin/sh
-
-savepath=$PATH
-export menupath=$PATH:/env/menu
-
-. /env/data/ansi-colors
-
-while true; do
- export PATH=${menupath}
-
- echo $PATH
-
- menu -a -m boot -d "${CYAN}Welcome to Barebox${NC}"
-
- boot-entries-collect
-
- menu -e -a -m boot -c "settings" -d "Settings"
- menu -e -a -m boot -c 'PATH=$savepath; echo "enter exit to return to menu"; sh' -d "${DARK_YELLOW}Shell${NC}"
- menu -e -a -m boot -c 'boot_order mmc2_1 && reset' -d "${RED}Reboot into internal flash${NC}"
- menu -e -a -m boot -c 'boot_order mmc1 && reset' -d "${RED}Reboot into SD card${NC}"
- menu -e -a -m boot -c 'boot_order usb_1 && reset' -d "${RED}Reboot over usb${NC}"
-
- menu -s -m boot
- menu -r -m boot
-done
diff --git a/arch/arm/configs/archosg9_defconfig b/arch/arm/configs/archosg9_defconfig
index c870209..db80c38 100644
--- a/arch/arm/configs/archosg9_defconfig
+++ b/arch/arm/configs/archosg9_defconfig
@@ -52,6 +52,7 @@ CONFIG_CMD_ECHO_E=y
CONFIG_CMD_EDIT=y
CONFIG_CMD_MENU=y
CONFIG_CMD_MENU_MANAGEMENT=y
+CONFIG_CMD_MENUTREE=y
CONFIG_CMD_READLINE=y
CONFIG_CMD_TIMEOUT=y
CONFIG_CMD_CRC=y
--
2.5.3
_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox
^ permalink raw reply [flat|nested] 6+ messages in thread
* [PATCH 3/3] archosg9: add display
2015-09-24 8:58 Archos G9: barebox board env contains boot-entries-collect Antony Pavlov
` (2 preceding siblings ...)
2015-09-25 22:41 ` [PATCH 2/3] archosg9: Use defaultenv-2-menu Vicente Bergas
@ 2015-09-25 22:41 ` Vicente Bergas
3 siblings, 0 replies; 6+ messages in thread
From: Vicente Bergas @ 2015-09-25 22:41 UTC (permalink / raw)
To: Antony Pavlov; +Cc: barebox, Vicente Bergas
Signed-off-by: Vicente Bergas <vicencb@gmail.com>
---
arch/arm/boards/archosg9/board.c | 111 ++++++++++++++++++++++++++++---
arch/arm/boards/archosg9/env/init/splash | 5 ++
arch/arm/boards/archosg9/mux.c | 20 +++---
arch/arm/configs/archosg9_defconfig | 7 +-
4 files changed, 123 insertions(+), 20 deletions(-)
create mode 100644 arch/arm/boards/archosg9/env/init/splash
diff --git a/arch/arm/boards/archosg9/board.c b/arch/arm/boards/archosg9/board.c
index 0a3c0b9..f80714e 100644
--- a/arch/arm/boards/archosg9/board.c
+++ b/arch/arm/boards/archosg9/board.c
@@ -11,6 +11,7 @@
*/
#include <common.h>
+#include <clock.h>
#include <init.h>
#include <ns16550.h>
#include <asm/armlinux.h>
@@ -18,6 +19,7 @@
#include <mach/omap4-silicon.h>
#include <mach/omap4-devices.h>
#include <mach/omap4_rom_usb.h>
+#include <mach/omap-fb.h>
#include <linux/sizes.h>
#include <i2c/i2c.h>
#include <gpio.h>
@@ -26,6 +28,19 @@
#include <readkey.h>
#include "archos_features.h"
+#define GPIO_LCD_PWON 38
+#define GPIO_BRIDGE_EN 39
+#define GPIO_LCD_RST 53
+#define GPIO_LCD_STDBY 101
+#define GPIO_LCD_AVDD_EN 12
+#define GPIO_BKL_EN 122
+#define GPIO_BKL_LED 143
+
+#define GPIO_5V_PWRON 36
+#define GPIO_VCC_PWRON 35
+#define GPIO_1V8_PWRON 34
+#define GPIO_GPS_ENABLE 41
+
static int archosg9_console_init(void)
{
barebox_set_model("Archos G9");
@@ -37,8 +52,6 @@ static int archosg9_console_init(void)
, NULL, 0, 0, 0, NULL);
}
if (IS_ENABLED(CONFIG_DRIVER_SERIAL_NS16550)) {
- gpio_direction_output(41, 0); /* gps_disable */
- gpio_direction_output(34, 1); /* 1v8_pwron */
omap44xx_add_uart1();
}
return 0;
@@ -54,7 +67,7 @@ mem_initcall(archosg9_mem_init);
static struct i2c_board_info i2c_devices[] = {
{ I2C_BOARD_INFO("twl6030", 0x48), },
};
-#if defined(CONFIG_KEYBOARD_TWL6030) && defined(CONFIG_KEYBOARD_GPIO)
+
static struct twl6030_pwrbtn_platform_data pwrbtn_data = {
.code = BB_KEY_ENTER
};
@@ -67,17 +80,97 @@ static struct gpio_keys_platform_data gk_data = {
.nbuttons = ARRAY_SIZE(keys),
.fifo_size = ARRAY_SIZE(keys)*sizeof(int)
};
-#endif
+
+static struct omapfb_display const archosg9_displays[] = {
+ {
+ .mode = {
+ .name = "g104x1",
+ .refresh = 60,
+ .xres = 1024,
+ .yres = 768,
+ .pixclock = 96000,
+ .left_margin = 320,
+ .right_margin = 1,
+ .hsync_len = 320,
+ .upper_margin = 38,
+ .lower_margin = 38,
+ .vsync_len = 2,
+ },
+ .config = (
+ OMAP_DSS_LCD_TFT | OMAP_DSS_LCD_IVS |
+ OMAP_DSS_LCD_IHS | OMAP_DSS_LCD_IPC |
+ OMAP_DSS_LCD_DATALINES_24
+ ),
+ .power_on_delay = 50,
+ .power_off_delay = 100,
+ },
+};
+
+static void archosg9_fb_enable(int e)
+{
+ if (e) {
+ gpio_direction_output(GPIO_LCD_PWON , 1);
+ mdelay(50);
+ gpio_direction_output(GPIO_LCD_RST , 0);
+ gpio_direction_output(GPIO_LCD_AVDD_EN, 0);
+ mdelay(35);
+ gpio_direction_output(GPIO_BRIDGE_EN , 1);
+ mdelay(10);
+ gpio_direction_output(GPIO_LCD_STDBY , 0);
+ gpio_direction_output(GPIO_BKL_EN , 0);
+ } else {
+ gpio_direction_output(GPIO_BKL_EN , 1);
+ gpio_direction_output(GPIO_LCD_STDBY , 1);
+ mdelay(1);
+ gpio_direction_output(GPIO_BRIDGE_EN , 0);
+ gpio_direction_output(GPIO_LCD_AVDD_EN, 1);
+ mdelay(10);
+ gpio_direction_output(GPIO_LCD_PWON , 0);
+ gpio_direction_output(GPIO_LCD_RST , 1);
+ }
+}
+
+static struct omapfb_platform_data archosg9_fb_data = {
+ .displays = archosg9_displays,
+ .num_displays = ARRAY_SIZE(archosg9_displays),
+ .dss_clk_hz = 19200000,
+ .bpp = 32,
+ .enable = archosg9_fb_enable,
+};
+
+static int archosg9_display_init(void)
+{
+ omap_add_display(&archosg9_fb_data);
+
+ gpio_direction_output(GPIO_BKL_EN , 1);
+ gpio_direction_output(GPIO_LCD_RST , 1);
+ gpio_direction_output(GPIO_LCD_PWON , 0);
+ gpio_direction_output(GPIO_BRIDGE_EN , 0);
+ gpio_direction_output(GPIO_LCD_STDBY , 1);
+ gpio_direction_output(GPIO_LCD_AVDD_EN, 1);
+ gpio_direction_output(GPIO_BKL_LED , 0);
+ gpio_direction_output(GPIO_VCC_PWRON , 1);
+
+ return 0;
+}
static int archosg9_devices_init(void){
+ gpio_direction_output(GPIO_GPS_ENABLE, 0);
+ gpio_direction_output(GPIO_1V8_PWRON , 1);
+
i2c_register_board_info(0, i2c_devices, ARRAY_SIZE(i2c_devices));
omap44xx_add_i2c1(NULL);
omap44xx_add_mmc1(NULL);
-#if defined(CONFIG_KEYBOARD_TWL6030) && defined(CONFIG_KEYBOARD_GPIO)
- add_generic_device_res("twl6030_pwrbtn", DEVICE_ID_DYNAMIC, 0, 0,
- &pwrbtn_data);
- add_gpio_keys_device(DEVICE_ID_DYNAMIC, &gk_data);
-#endif
+ if (IS_ENABLED(CONFIG_KEYBOARD_TWL6030) &&
+ IS_ENABLED(CONFIG_KEYBOARD_GPIO)) {
+ add_generic_device_res("twl6030_pwrbtn", DEVICE_ID_DYNAMIC,
+ 0, 0, &pwrbtn_data);
+ add_gpio_keys_device(DEVICE_ID_DYNAMIC, &gk_data);
+ }
+
+ if (IS_ENABLED(CONFIG_DRIVER_VIDEO_OMAP))
+ archosg9_display_init();
+
/*
* This should be:
* armlinux_set_architecture(MACH_TYPE_OMAP4_ARCHOSG9);
diff --git a/arch/arm/boards/archosg9/env/init/splash b/arch/arm/boards/archosg9/env/init/splash
new file mode 100644
index 0000000..4441b90
--- /dev/null
+++ b/arch/arm/boards/archosg9/env/init/splash
@@ -0,0 +1,5 @@
+#!/bin/sh
+
+fb0.mode_name=g104x1
+splash -b0 /mnt/usb/barebox.png
+fb0.enable=1
diff --git a/arch/arm/boards/archosg9/mux.c b/arch/arm/boards/archosg9/mux.c
index 4fab759..e9cb3c4 100644
--- a/arch/arm/boards/archosg9/mux.c
+++ b/arch/arm/boards/archosg9/mux.c
@@ -29,14 +29,14 @@ static const struct pad_conf_entry core_padconf_array[] = {
{ GPMC_AD7 , IEN | PTU | M1 },
{ GPMC_AD8 , IEN | PTD | M3 },
{ GPMC_AD9 , IEN | PTU | M0 },
- { GPMC_AD10 , IEN | PTU | M0 },
- { GPMC_AD11 , IEN | PTU | M0 },
- { GPMC_AD12 , IEN | PTD | M0 },
+ { GPMC_AD10 , IEN | PTU | M3 },
+ { GPMC_AD11 , IEN | PTU | M3 },
+ { GPMC_AD12 , IEN | PTD | M3 },
{ GPMC_AD13 , PTD | M3 },
{ GPMC_AD14 , PTD | M3 },
{ GPMC_AD15 , PTD | M3 },
{ GPMC_A16 , IEN | PTD | M7 },
- { GPMC_A17 , IEN | PTD | M7 },
+ { GPMC_A17 , IEN | PTD | M3 },
{ GPMC_A18 , IEN | PTD | M1 },
{ GPMC_A19 , IEN | PTU | M3 },
{ GPMC_A20 , IEN | PTU | M3 },
@@ -48,7 +48,7 @@ static const struct pad_conf_entry core_padconf_array[] = {
{ GPMC_NCS0 , IEN | PTU | M0 },
{ GPMC_NCS1 , IEN | PTU | M7 },
{ GPMC_NCS2 , IEN | PTU | M7 },
- { GPMC_NCS3 , IEN | PTU | M7 },
+ { GPMC_NCS3 , IEN | PTU | M3 },
{ GPMC_NWP , IEN | PTD | M0 },
{ GPMC_CLK , IEN | PTD | M0 },
{ GPMC_NADV_ALE , IEN | PTD | M0 },
@@ -59,7 +59,7 @@ static const struct pad_conf_entry core_padconf_array[] = {
{ GPMC_WAIT0 , IEN | PTU | M0 },
{ GPMC_WAIT1 , IEN | PTU | M7 },
{ GPMC_WAIT2 , IEN | PTD | M7 },
- { GPMC_NCS4 , IEN | PTD | M7 },
+ { GPMC_NCS4 , IEN | PTD | M3 },
{ GPMC_NCS5 , IEN | PTD | M7 },
{ GPMC_NCS6 , IEN | PTD | M7 },
{ GPMC_NCS7 , IEN | PTD | M7 },
@@ -125,8 +125,8 @@ static const struct pad_conf_entry core_padconf_array[] = {
{ ABE_CLKS , IEN | PTD | M7 },
{ ABE_DMIC_CLK1 , IEN | PTD | M7 },
{ ABE_DMIC_DIN1 , IEN | PTD | M7 },
- { ABE_DMIC_DIN2 , IEN | PTD | M7 },
- { ABE_DMIC_DIN3 , IEN | PTD | M7 },
+ { ABE_DMIC_DIN2 , IEN | PTD | M3 },
+ { ABE_DMIC_DIN3 , IEN | PTD | M3 },
{ UART2_CTS , IEN | PTU | M0 },
{ UART2_RTS , M0 },
{ UART2_RX , IEN | M0 },
@@ -149,7 +149,7 @@ static const struct pad_conf_entry core_padconf_array[] = {
{ MCSPI1_CS3 , IEN | PTU | M7 },
{ UART3_CTS_RCTX , M1 },
{ UART3_RTS_SD , M0 },
- { UART3_RX_IRRX , IEN | PTU | M0 },
+ { UART3_RX_IRRX , IEN | PTU | M3 },
{ UART3_TX_IRTX , M0 },
{ SDMMC5_CLK , PTU | M0 },
{ SDMMC5_CMD , IEN | PTU | M0 },
@@ -203,7 +203,7 @@ static const struct pad_conf_entry core_padconf_array[] = {
{ SYS_BOOT4 , IEN | PTD | M0 },
{ SYS_BOOT5 , IEN | PTD | M0 },
{ DPM_EMU0 , IEN | PTU | M0 },
- { DPM_EMU1 , IEN | PTU | M0 },
+ { DPM_EMU1 , IEN | PTU | M3 },
{ DPM_EMU2 , IEN | PTD | M7 },
{ DPM_EMU3 , M5 },
{ DPM_EMU4 , M5 },
diff --git a/arch/arm/configs/archosg9_defconfig b/arch/arm/configs/archosg9_defconfig
index db80c38..4bafcf9 100644
--- a/arch/arm/configs/archosg9_defconfig
+++ b/arch/arm/configs/archosg9_defconfig
@@ -53,6 +53,7 @@ CONFIG_CMD_EDIT=y
CONFIG_CMD_MENU=y
CONFIG_CMD_MENU_MANAGEMENT=y
CONFIG_CMD_MENUTREE=y
+CONFIG_CMD_SPLASH=y
CONFIG_CMD_READLINE=y
CONFIG_CMD_TIMEOUT=y
CONFIG_CMD_CRC=y
@@ -76,6 +77,10 @@ CONFIG_I2C=y
CONFIG_I2C_OMAP=y
CONFIG_USB_HOST=y
CONFIG_USB_EHCI=y
+CONFIG_VIDEO=y
+CONFIG_DRIVER_VIDEO_OMAP=y
+CONFIG_DRIVER_VIDEO_SIMPLEFB=y
+CONFIG_DRIVER_VIDEO_EDID=y
CONFIG_MCI=y
CONFIG_MCI_STARTUP=y
CONFIG_MCI_OMAP_HSMMC=y
@@ -91,5 +96,5 @@ CONFIG_FS_NFS=y
CONFIG_FS_FAT=y
CONFIG_FS_FAT_WRITE=y
CONFIG_FS_FAT_LFN=y
-CONFIG_ZLIB=y
CONFIG_LZO_DECOMPRESS=y
+CONFIG_PNG=y
--
2.5.3
_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH 0/3] ArchosG9 updates.
2015-09-25 22:41 ` [PATCH 0/3] ArchosG9 updates Vicente Bergas
@ 2015-09-29 6:40 ` Sascha Hauer
0 siblings, 0 replies; 6+ messages in thread
From: Sascha Hauer @ 2015-09-29 6:40 UTC (permalink / raw)
To: Vicente Bergas; +Cc: barebox
Hi Vicente,
On Fri, Sep 25, 2015 at 11:41:00PM +0100, Vicente Bergas wrote:
> Hello,
> This series of patches contain updates to the ArchosG9 code.
> The first one is just regenerating the *_defconfig with "make savedefconfig"
> The second fixes the issue spotted by Antony Pavlov.
> The third adds the display. I had that change forgotten somewhere and
> thought that it would be better to share it.
>
> By the way, while checking the patches with "scripts/checkpatch.pl" the script
> itself reported several 'Unescaped left brace in regex is deprecated' warnings.
> The perl version is v5.22.0.
Wow, so we need a checkcheckpatch script :)
Thanks for noting. There are probably checkpatch updates to find in the
Linux Kernel.
Applied all, thanks
Sascha
--
Pengutronix e.K. | |
Industrial Linux Solutions | http://www.pengutronix.de/ |
Peiner Str. 6-8, 31137 Hildesheim, Germany | Phone: +49-5121-206917-0 |
Amtsgericht Hildesheim, HRA 2686 | Fax: +49-5121-206917-5555 |
_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox
^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2015-09-29 6:40 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2015-09-24 8:58 Archos G9: barebox board env contains boot-entries-collect Antony Pavlov
2015-09-25 22:41 ` [PATCH 0/3] ArchosG9 updates Vicente Bergas
2015-09-29 6:40 ` Sascha Hauer
2015-09-25 22:41 ` [PATCH 1/3] archosg9: re-generate defconfigs with "make savedefconfig" Vicente Bergas
2015-09-25 22:41 ` [PATCH 2/3] archosg9: Use defaultenv-2-menu Vicente Bergas
2015-09-25 22:41 ` [PATCH 3/3] archosg9: add display Vicente Bergas
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox