| | |
| | | diff -Nuar linux-3.2.0/arch/arm/mach-omap2/board-am335xevm.c linux-3.2.0-ok335x/arch/arm/mach-omap2/board-am335xevm.c |
| | | --- linux-3.2.0/arch/arm/mach-omap2/board-am335xevm.c 2014-01-22 18:20:21.000000000 +0800 |
| | | +++ linux-3.2.0-ok335x/arch/arm/mach-omap2/board-am335xevm.c 2019-07-29 13:35:32.026115491 +0800 |
| | | @@ -2160,8 +2160,8 @@ |
| | | +++ linux-3.2.0-ok335x/arch/arm/mach-omap2/board-am335xevm.c 2019-08-02 01:06:20.599882656 +0800 |
| | | @@ -116,8 +116,8 @@ |
| | | #define SCREEN_SIZE_480X272_4 3 |
| | | #define SCREEN_SIZE_800X600_10 4 |
| | | |
| | | -int screen_type; |
| | | -int screen_size; |
| | | +int screen_type = SCREEN_TYPE_C; |
| | | +int screen_size = SCREEN_SIZE_800X480_7; |
| | | |
| | | static const struct display_panel disp_panel = { |
| | | WVGA, |
| | | @@ -2017,47 +2017,38 @@ |
| | | am33xx_register_ehrpwm(2, &pwm_pdata[2]); |
| | | } |
| | | |
| | | -/* NAND partition information */ |
| | | + |
| | | +/* NAND(MT29F2G08ABAEAWP, 256M) partition information, modify partition by guowenxue */ |
| | | static struct mtd_partition am335x_nand_partitions[] = { |
| | | /* All the partition sizes are listed in terms of NAND block size */ |
| | | { |
| | | .name = "SPL", |
| | | - .offset = 0, /* Offset = 0x0 */ |
| | | - .size = SZ_128K, |
| | | - }, |
| | | - { |
| | | - .name = "SPL.backup1", |
| | | - .offset = MTDPART_OFS_APPEND, /* Offset = 0x20000 */ |
| | | - .size = SZ_128K, |
| | | - }, |
| | | - { |
| | | - .name = "SPL.backup2", |
| | | - .offset = MTDPART_OFS_APPEND, /* Offset = 0x40000 */ |
| | | - .size = SZ_128K, |
| | | - }, |
| | | - { |
| | | - .name = "SPL.backup3", |
| | | - .offset = MTDPART_OFS_APPEND, /* Offset = 0x60000 */ |
| | | - .size = SZ_128K, |
| | | + .offset = 0, /* Offset = 0x000000 */ |
| | | + .size = 1*SZ_512K, |
| | | }, |
| | | { |
| | | .name = "U-Boot", |
| | | - .offset = MTDPART_OFS_APPEND, /* Offset = 0x80000 */ |
| | | - .size = 15 * SZ_128K, |
| | | + .offset = MTDPART_OFS_APPEND, /* Offset = 0x080000 */ |
| | | + .size = 1*SZ_256K, |
| | | }, |
| | | { |
| | | .name = "U-Boot Env", |
| | | - .offset = MTDPART_OFS_APPEND, /* Offset = 0x260000 */ |
| | | - .size = 1 * SZ_128K, |
| | | + .offset = MTDPART_OFS_APPEND, /* Offset = 0x0C0000 */ |
| | | + .size = 1*SZ_256K, |
| | | }, |
| | | { |
| | | .name = "Kernel", |
| | | - .offset = MTDPART_OFS_APPEND, /* Offset = 0x280000 */ |
| | | - .size = 40 * SZ_128K, |
| | | + .offset = MTDPART_OFS_APPEND, /* Offset = 0x100000 */ |
| | | + .size = 5*SZ_1M, |
| | | }, |
| | | { |
| | | - .name = "File System", |
| | | - .offset = MTDPART_OFS_APPEND, /* Offset = 0x780000 */ |
| | | + .name = "Rootfs", |
| | | + .offset = MTDPART_OFS_APPEND, /* Offset = 0x600000 */ |
| | | + .size = 150*SZ_1M, |
| | | + }, |
| | | + { |
| | | + .name = "Apps", |
| | | + .offset = MTDPART_OFS_APPEND, /* Offset = 0x9c00000 */ |
| | | .size = MTDPART_SIZ_FULL, |
| | | }, |
| | | }; |
| | | @@ -2160,8 +2151,10 @@ |
| | | &am335x_nand_timings); |
| | | if (!pdata) |
| | | return; |
| | | -// pdata->ecc_opt =OMAP_ECC_BCH8_CODE_HW; |
| | | - pdata->ecc_opt =OMAP_ECC_HAMMING_CODE_DEFAULT; |
| | | + pdata->ecc_opt =OMAP_ECC_BCH8_CODE_HW; |
| | | + |
| | | + /* Modify by guowenxue, kernel & rootfs must use ECC_BCH8 in u-boot */ |
| | | + pdata->ecc_opt =OMAP_ECC_BCH8_CODE_HW; |
| | | + //pdata->ecc_opt =OMAP_ECC_HAMMING_CODE_DEFAULT; |
| | | |
| | | pdata->elm_used = true; |
| | | gpmc_device[0].pdata = pdata; |
| | | @@ -3121,10 +3114,15 @@ |
| | | |
| | | static int __init screentype_setup(char *str) |
| | | { |
| | | + /* Modify by guowenxue, our OK335XD use 800x480-7" capacitive LCD */ |
| | | + screen_type = SCREEN_TYPE_C; |
| | | + |
| | | +#if 0 |
| | | if(!strncmp(str,"C",1)) |
| | | screen_type = SCREEN_TYPE_C; |
| | | else |
| | | screen_type = SCREEN_TYPE_R; |
| | | +#endif |
| | | |
| | | return 1; |
| | | } |
| | | @@ -3132,6 +3130,9 @@ |
| | | |
| | | static int __init screensize_setup(char *str) |
| | | { |
| | | + /* Modify by guowenxue, our OK335XD use 800x480-7" capacitive LCD */ |
| | | + screen_size = SCREEN_SIZE_800X480_7; |
| | | +#if 0 |
| | | if(!strncmp(str,"800x600-8",9)) |
| | | screen_size = SCREEN_SIZE_800X600_8; |
| | | else if(!strncmp(str,"800x480-5",9)) |
| | | @@ -3142,6 +3143,7 @@ |
| | | screen_size = SCREEN_SIZE_800X600_10; |
| | | else |
| | | screen_size = SCREEN_SIZE_480X272_4; |
| | | +#endif |
| | | |
| | | return 1; |
| | | } |
| | | diff -Nuar linux-3.2.0/build.sh linux-3.2.0-ok335x/build.sh |
| | | --- linux-3.2.0/build.sh 1970-01-01 08:00:00.000000000 +0800 |
| | | +++ linux-3.2.0-ok335x/build.sh 2019-07-29 13:34:57.430114827 +0800 |
| | | +++ linux-3.2.0-ok335x/build.sh 2019-08-02 01:06:20.599882656 +0800 |
| | | @@ -0,0 +1,74 @@ |
| | | +#!/bin/bash |
| | | + |
| | |
| | | + |
| | | diff -Nuar linux-3.2.0/.cfg-ok335x linux-3.2.0-ok335x/.cfg-ok335x |
| | | --- linux-3.2.0/.cfg-ok335x 1970-01-01 08:00:00.000000000 +0800 |
| | | +++ linux-3.2.0-ok335x/.cfg-ok335x 2019-07-29 13:30:10.022109314 +0800 |
| | | +++ linux-3.2.0-ok335x/.cfg-ok335x 2019-08-02 01:07:23.463883862 +0800 |
| | | @@ -0,0 +1,2936 @@ |
| | | +# |
| | | +# Automatically generated file; DO NOT EDIT. |
| | |
| | | +CONFIG_NLATTR=y |
| | | +CONFIG_AVERAGE=y |
| | | +# CONFIG_CORDIC is not set |
| | | diff -Nuar linux-3.2.0/ChangeLog.txt linux-3.2.0-ok335x/ChangeLog.txt |
| | | --- linux-3.2.0/ChangeLog.txt 1970-01-01 08:00:00.000000000 +0800 |
| | | +++ linux-3.2.0-ok335x/ChangeLog.txt 2019-08-02 01:06:20.603882656 +0800 |
| | | @@ -0,0 +1,15 @@ |
| | | + |
| | | +1. Nandflash(MT29F2G08ABAEAWP, 256M) Partition |
| | | +----------------------------------------------- |
| | | + |
| | | +arch/arm/mach-omap2/board-am335xevm.c: |
| | | + |
| | | +0x000000000000-0x000000080000 : "SPL" |
| | | +0x000000080000-0x0000000c0000 : "U-Boot" |
| | | +0x0000000c0000-0x000000100000 : "U-Boot Env" |
| | | +0x000000100000-0x000000600000 : "Kernel" |
| | | +0x000000600000-0x000009c00000 : "Rootfs" |
| | | +0x000009c00000-0x000010000000 : "Apps" |
| | | + |
| | | + |
| | | + |
| | | diff -Nuar linux-3.2.0/drivers/input/touchscreen/ft5x06_ts.c linux-3.2.0-ok335x/drivers/input/touchscreen/ft5x06_ts.c |
| | | --- linux-3.2.0/drivers/input/touchscreen/ft5x06_ts.c 2014-01-17 14:37:52.000000000 +0800 |
| | | +++ linux-3.2.0-ok335x/drivers/input/touchscreen/ft5x06_ts.c 2019-08-02 01:06:20.603882656 +0800 |
| | | @@ -16,7 +16,7 @@ |
| | | *
|
| | | * VERSION DATE AUTHOR Note
|
| | | * 1.0 2010-01-05 WenFS only support mulititouch Wenfs 2010-10-01
|
| | | - * 2.0 2011-09-05 Duxx Add touch key, and project setting update, auto CLB command
|
| | | + * 2.0 2011-09-05 Duxx Add touch key, and project setting update, auto CLB command
|
| | | * 3.0 2011-09-09 Luowj |
| | | *
|
| | | */
|
| | | @@ -1672,7 +1672,7 @@ |
| | | int i;
|
| | | #endif
|
| | | |
| | | - //printk("[FTS] ft5x0x_ts_probe, driver version is %s.\n", CFG_FTS_CTP_DRIVER_VERSION);
|
| | | + //printk("[#######FTS] ft5x0x_ts_probe, driver version is v1.0.0.0.\n");
|
| | | |
| | | if (!i2c_check_functionality(client->adapter, I2C_FUNC_I2C)) {
|
| | | err = -ENODEV;
|
| | | @@ -1922,7 +1922,7 @@ |
| | | static int __init ft5x0x_ts_init(void)
|
| | | {
|
| | | int ret;
|
| | | - //printk("ft5x0x_ts_init\n");
|
| | | + //printk("[#######FTS]ft5x0x_ts_init\n");
|
| | | ret = i2c_add_driver(&ft5x0x_ts_driver);
|
| | | //printk("ret=%d\n",ret);
|
| | | return ret;
|
| | | diff -Nuar linux-3.2.0/Makefile linux-3.2.0-ok335x/Makefile |
| | | --- linux-3.2.0/Makefile 2019-07-28 20:25:29.000000000 +0800 |
| | | +++ linux-3.2.0-ok335x/Makefile 2019-07-29 13:07:08.678082816 +0800 |
| | | +++ linux-3.2.0-ok335x/Makefile 2019-08-02 01:06:20.623882656 +0800 |
| | | @@ -192,8 +192,8 @@ |
| | | # Default value for CROSS_COMPILE is not to prefix executables |
| | | # Note: Some architectures assign CROSS_COMPILE in their arch/*/Makefile |