Hi!
On Thu 2009-06-18 00:31:15, Brian Swetland wrote:
> This is just enough to get the device booting and serial console
> working. Sufficient for debugging further MSM7k/Dream Support.
> This will support HTC Dream / T-Mobile G1 / Android ADP1 (which
> are all the same hardware, known as "trout" to the ARM machine
> database).
>
> Signed-off-by: Brian Swetland <[email protected]>
> Acked-by: Pavel Machek <[email protected]>
> Reviewed-by: GeunSik Lim <[email protected]>
I'm trying to get this series to work -- i.e. get dream boot up-to
serial console.
I tried applying series on 2.6.29, and it failed compilation.
On 2.6.30 and 2.6.32-rc, I get "Uncompressing linux..." feedback on
serial, but that's it. Do you still remember what kernel version these
should be applied to? .config would be helpful, too...
Pavel
> ---
> arch/arm/mach-msm/Kconfig | 6 +++
> arch/arm/mach-msm/Makefile | 1 +
> arch/arm/mach-msm/board-dream.c | 84 +++++++++++++++++++++++++++++++++++++++
> arch/arm/mach-msm/board-dream.h | 5 ++
> 4 files changed, 96 insertions(+), 0 deletions(-)
> create mode 100644 arch/arm/mach-msm/board-dream.c
> create mode 100644 arch/arm/mach-msm/board-dream.h
>
> diff --git a/arch/arm/mach-msm/Kconfig b/arch/arm/mach-msm/Kconfig
> index 35f2a90..f780086 100644
> --- a/arch/arm/mach-msm/Kconfig
> +++ b/arch/arm/mach-msm/Kconfig
> @@ -34,4 +34,10 @@ config MACH_HALIBUT
> help
> Support for the Qualcomm SURF7201A eval board.
>
> +config MACH_TROUT
> + default y
> + bool "HTC Dream (aka trout)"
> + help
> + Support for the HTC Dream, T-Mobile G1, Android ADP1 devices.
> +
> endif
> diff --git a/arch/arm/mach-msm/Makefile b/arch/arm/mach-msm/Makefile
> index 1aa4700..91e6f5c 100644
> --- a/arch/arm/mach-msm/Makefile
> +++ b/arch/arm/mach-msm/Makefile
> @@ -6,3 +6,4 @@ obj-y += clock.o clock-7x01a.o
>
> obj-$(CONFIG_MACH_HALIBUT) += board-halibut.o
>
> +obj-$(CONFIG_MACH_TROUT) += board-dream.o
> diff --git a/arch/arm/mach-msm/board-dream.c b/arch/arm/mach-msm/board-dream.c
> new file mode 100644
> index 0000000..6eae7e3
> --- /dev/null
> +++ b/arch/arm/mach-msm/board-dream.c
> @@ -0,0 +1,84 @@
> +/* linux/arch/arm/mach-msm/board-dream.c
> + *
> + * Copyright (C) 2009 Google, Inc.
> + * Author: Brian Swetland <[email protected]>
> + *
> + * This software is licensed under the terms of the GNU General Public
> + * License version 2, as published by the Free Software Foundation, and
> + * may be copied, distributed, and modified under those terms.
> + *
> + * This program is distributed in the hope that it will be useful,
> + * but WITHOUT ANY WARRANTY; without even the implied warranty of
> + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
> + * GNU General Public License for more details.
> + *
> + */
> +
> +#include <linux/kernel.h>
> +#include <linux/init.h>
> +#include <linux/platform_device.h>
> +
> +#include <asm/mach-types.h>
> +#include <asm/mach/arch.h>
> +#include <asm/mach/map.h>
> +
> +#include <mach/board.h>
> +#include <mach/hardware.h>
> +#include <mach/msm_iomap.h>
> +
> +#include "devices.h"
> +#include "board-dream.h"
> +
> +static struct platform_device *devices[] __initdata = {
> + &msm_device_uart3,
> + &msm_device_smd,
> + &msm_device_nand,
> + &msm_device_hsusb,
> + &msm_device_i2c,
> +};
> +
> +extern struct sys_timer msm_timer;
> +
> +static void __init trout_init_irq(void)
> +{
> + msm_init_irq();
> +}
> +
> +static void __init trout_init(void)
> +{
> + platform_add_devices(devices, ARRAY_SIZE(devices));
> +}
> +
> +static struct map_desc trout_io_desc[] __initdata = {
> + {
> + .virtual = TROUT_CPLD_BASE,
> + .pfn = __phys_to_pfn(TROUT_CPLD_START),
> + .length = TROUT_CPLD_SIZE,
> + .type = MT_DEVICE_NONSHARED
> + }
> +};
> +
> +static void __init trout_map_io(void)
> +{
> + msm_map_common_io();
> + iotable_init(trout_io_desc, ARRAY_SIZE(trout_io_desc));
> +
> +#ifdef CONFIG_MSM_DEBUG_UART3
> + /* route UART3 to the "H2W" extended usb connector */
> + writeb(0x80, TROUT_CPLD_BASE + 0x00);
> +#endif
> +
> + msm_clock_init();
> +}
> +
> +MACHINE_START(TROUT, "HTC Dream")
> +#ifdef CONFIG_MSM_DEBUG_UART
> + .phys_io = MSM_DEBUG_UART_PHYS,
> + .io_pg_offst = ((MSM_DEBUG_UART_BASE) >> 18) & 0xfffc,
> +#endif
> + .boot_params = 0x10000100,
> + .map_io = trout_map_io,
> + .init_irq = trout_init_irq,
> + .init_machine = trout_init,
> + .timer = &msm_timer,
> +MACHINE_END
> diff --git a/arch/arm/mach-msm/board-dream.h b/arch/arm/mach-msm/board-dream.h
> new file mode 100644
> index 0000000..4f345a5
> --- /dev/null
> +++ b/arch/arm/mach-msm/board-dream.h
> @@ -0,0 +1,5 @@
> +
> +#define TROUT_CPLD_BASE 0xE8100000
> +#define TROUT_CPLD_START 0x98000000
> +#define TROUT_CPLD_SIZE SZ_4K
> +
--
(english) http://www.livejournal.com/~pavelmachek
(cesky, pictures) http://atrey.karlin.mff.cuni.cz/~pavel/picture/horses/blog.html
On Sun, Nov 1, 2009 at 2:13 PM, Pavel Machek <[email protected]> wrote:
> Hi!
>
> On Thu 2009-06-18 00:31:15, Brian Swetland wrote:
>> This is just enough to get the device booting and serial console
>> working. Sufficient for debugging further MSM7k/Dream Support.
>> This will support HTC Dream / T-Mobile G1 / Android ADP1 (which
>> are all the same hardware, known as "trout" to the ARM machine
>> database).
>>
>> Signed-off-by: Brian Swetland <[email protected]>
>> Acked-by: Pavel Machek <[email protected]>
>> Reviewed-by: GeunSik Lim <[email protected]>
>
> I'm trying to get this series to work -- i.e. get dream boot up-to
> serial console.
>
> I tried applying series on 2.6.29, and it failed compilation.
>
> On 2.6.30 and 2.6.32-rc, I get "Uncompressing linux..." feedback on
> serial, but that's it. Do you still remember what kernel version these
> should be applied to? .config would be helpful, too...
Pretty sure it's something later than .29
Does enabling DEBUG_LL help? If something's dying before the serial
port is registered, you might never see any console chatter.
Also, I believe you'll want to pass console=ttyMSM2,115200n8 on the
kernel commandline (-c parameter to fastboot or mkbootimg).
Brian
On Sun 2009-11-01 15:01:19, Brian Swetland wrote:
> On Sun, Nov 1, 2009 at 2:13 PM, Pavel Machek <[email protected]> wrote:
> > Hi!
> >
> > On Thu 2009-06-18 00:31:15, Brian Swetland wrote:
> >> This is just enough to get the device booting and serial console
> >> working. ?Sufficient for debugging further MSM7k/Dream Support.
> >> This will support HTC Dream / T-Mobile G1 / Android ADP1 (which
> >> are all the same hardware, known as "trout" to the ARM machine
> >> database).
> >>
> >> Signed-off-by: Brian Swetland <[email protected]>
> >> Acked-by: Pavel Machek <[email protected]>
> >> Reviewed-by: GeunSik Lim <[email protected]>
> >
> > I'm trying to get this series to work -- i.e. get dream boot up-to
> > serial console.
> >
> > I tried applying series on 2.6.29, and it failed compilation.
> >
> > On 2.6.30 and 2.6.32-rc, I get "Uncompressing linux..." feedback on
> > serial, but that's it. Do you still remember what kernel version these
> > should be applied to? .config would be helpful, too...
>
> Pretty sure it's something later than .29
I guess I should try 2.6.31.
> Does enabling DEBUG_LL help? If something's dying before the serial
> port is registered, you might never see any console chatter.
DEBUG_LL does not help. Is that early_printk() equivalent?
With DEBUG_ICEDC I don't even get "uncompressing linux" message.
Yes, I believe it dies before serial registration :-(. Being able to
call puts() that decompressor uses would be useful...
> Also, I believe you'll want to pass console=ttyMSM2,115200n8 on the
> kernel commandline (-c parameter to fastboot or mkbootimg).
I'm using "console=ttyMSM2 rootdelay=5 fbcon=rotate:1" that worked for
me on another kernel version...
Thanks,
Pavel
--
(english) http://www.livejournal.com/~pavelmachek
(cesky, pictures) http://atrey.karlin.mff.cuni.cz/~pavel/picture/horses/blog.html
On Sun, Nov 1, 2009 at 3:19 PM, Pavel Machek <[email protected]> wrote:
>>
>> Pretty sure it's something later than .29
>
> I guess I should try 2.6.31.
>
>> Does enabling DEBUG_LL help? If something's dying before the serial
>> port is registered, you might never see any console chatter.
>
> DEBUG_LL does not help. Is that early_printk() equivalent?
> With DEBUG_ICEDC I don't even get "uncompressing linux" message.
ICEDCC will try to send messages to JTAG DCC.
Sticking a call to printascii(printk_buf) after the vscnprintf() in
vprintk() in kernel/printk.c is sometimes useful alongside DEBUG_LL
(so that printks will go to the serial port immediately).
> Yes, I believe it dies before serial registration :-(. Being able to
> call puts() that decompressor uses would be useful...
>
>> Also, I believe you'll want to pass console=ttyMSM2,115200n8 on the
>> kernel commandline (-c parameter to fastboot or mkbootimg).
>
> I'm using "console=ttyMSM2 rootdelay=5 fbcon=rotate:1" that worked for
> me on another kernel version...
>
On Sun 2009-11-01 15:33:39, Brian Swetland wrote:
> On Sun, Nov 1, 2009 at 3:19 PM, Pavel Machek <[email protected]> wrote:
> >>
> >> Pretty sure it's something later than .29
> >
> > I guess I should try 2.6.31.
> >
> >> Does enabling DEBUG_LL help? ?If something's dying before the serial
> >> port is registered, you might never see any console chatter.
> >
> > DEBUG_LL does not help. Is that early_printk() equivalent?
> > With DEBUG_ICEDC I don't even get "uncompressing linux" message.
>
> ICEDCC will try to send messages to JTAG DCC.
>
> Sticking a call to printascii(printk_buf) after the vscnprintf() in
> vprintk() in kernel/printk.c is sometimes useful alongside DEBUG_LL
> (so that printks will go to the serial port immediately).
Thanks, that did the trick. I'm now at:
Uncompressing
Linux...................................................................
done, booting the kernel.
<5>Linux version 2.6.32-rc5-00486-g5b11a58-dirty (pavel@amd) (gcc
version 4.3.2 (Debi9
CPU: ARMv6-compatible processor [4117b362] revision 2 (ARMv6TEJ),
cr=00c5387f
CPU: VIPT aliasing data cache, VIPT aliasing instruction cache
Machine: HTC Dream
<4>Ignoring unrecognised tag 0x4d534d70
<4>Ignoring unrecognised tag 0x57494649
<4>Ignoring unrecognised tag 0x89768976
Memory policy: ECC disabled, Data cache writeback
<3>INITRD: 0x11000000+0x00024aa8 extends beyond physical memory -
disabling initrd
<7>On node 0 totalpages: 0
<1>bootmem alloc of 32768 bytes failed!
<0>Kernel panic - not syncing: Out of memory
...and I managed to fix that by introducing dream_fixup(). Thanks!
Pavel
--
(english) http://www.livejournal.com/~pavelmachek
(cesky, pictures) http://atrey.karlin.mff.cuni.cz/~pavel/picture/horses/blog.html