Date: Thu, 16 Aug 2012 20:18:10 +0000 From: aleek@FreeBSD.org To: svn-soc-all@FreeBSD.org Subject: socsvn commit: r240446 - soc2012/aleek/beaglexm-armv6/sys/arm/ti Message-ID: <20120816201810.CAC0E1065691@hub.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: aleek Date: Thu Aug 16 20:18:10 2012 New Revision: 240446 URL: http://svnweb.FreeBSD.org/socsvn/?view=rev&rev=240446 Log: refactoring part2 - ti_machdep Modified: soc2012/aleek/beaglexm-armv6/sys/arm/ti/ti_cpuid.c soc2012/aleek/beaglexm-armv6/sys/arm/ti/ti_machdep.c Modified: soc2012/aleek/beaglexm-armv6/sys/arm/ti/ti_cpuid.c ============================================================================== --- soc2012/aleek/beaglexm-armv6/sys/arm/ti/ti_cpuid.c Thu Aug 16 19:22:34 2012 (r240445) +++ soc2012/aleek/beaglexm-armv6/sys/arm/ti/ti_cpuid.c Thu Aug 16 20:18:10 2012 (r240446) @@ -253,12 +253,6 @@ cpu_last_char, AM335X_DEVREV(chip_revision)); } -/* static void -am37x_get_revision(void) -{ - // XXX @TODO fix this - printf( "Texas Instruments AM37x HABABABA Processor - FIXME bejbe\n" ); -}*/ /** * ti_cpu_ident - attempts to identify the chip we are running on * @dummy: ignored @@ -285,7 +279,6 @@ break; case CHIP_AM37X: omap3_get_revision(); - //am37x_get_revision(); break; default: panic("Unknown chip type, fixme!\n"); Modified: soc2012/aleek/beaglexm-armv6/sys/arm/ti/ti_machdep.c ============================================================================== --- soc2012/aleek/beaglexm-armv6/sys/arm/ti/ti_machdep.c Thu Aug 16 19:22:34 2012 (r240445) +++ soc2012/aleek/beaglexm-armv6/sys/arm/ti/ti_machdep.c Thu Aug 16 20:18:10 2012 (r240446) @@ -88,8 +88,9 @@ #include <machine/bus.h> #include <sys/reboot.h> +#if defined(SOC_OMAP4) #include <arm/ti/omap4/omap4_reg.h> -#include <arm/ti/am37x/am37x_early_uart.h> +#endif #ifdef DEBUG #define debugf(fmt, args...) printf(fmt, ##args) @@ -299,30 +300,6 @@ phys_avail[j + 1] = 0; } -void -beagle_early_puts(char *s); - -void -beagle_early_puts(char *s) -{ - // 0xFFFFEE00 - volatile uint32_t *uart = (volatile uint32_t *)0x49020000; - volatile uint32_t *uart_lsr = (volatile uint32_t *)0x49020014; - while (*s) - { - while ((*uart_lsr & 0x20) == 0); - *uart = *s++; - - if (*(s-1) == '\n') - { - while ((*uart_lsr & 0x20) == 0); - *uart = '\r'; - } - } -} - - - void * initarm(void *mdp, void *unused __unused) { @@ -334,8 +311,6 @@ u_int l1pagetable; int i = 0, j = 0; - arm_early_puts( "BeagleBoard-XM revC FreeBSD booting...\n" ); - kmdp = NULL; lastaddr = 0; memsize = 0; @@ -395,8 +370,6 @@ &memsize) != 0) while(1); - eprintf( "Memory size: %d\n", memsize ); - // if (fdt_immr_addr(OMAP44XX_L4_PERIPH_VBASE) != 0) // while (1); @@ -655,7 +628,7 @@ fdt_devmap[i].pd_prot = VM_PROT_READ | VM_PROT_WRITE; fdt_devmap[i].pd_cache = PTE_DEVICE; i++; -#elif defined(SOC_TI_AM37X) +#elif defined(SOC_TI_AM37X) || defined(SOC_OMAP3) fdt_devmap[i].pd_va = 0xE8000000; fdt_devmap[i].pd_pa = 0x48000000; fdt_devmap[i].pd_size = 0x1000000;
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20120816201810.CAC0E1065691>