r2764 - trunk/src/target/u-boot/patches
laforge at sita.openmoko.org
laforge at sita.openmoko.org
Tue Aug 21 20:47:39 CEST 2007
Author: laforge
Date: 2007-08-21 20:47:23 +0200 (Tue, 21 Aug 2007)
New Revision: 2764
Modified:
trunk/src/target/u-boot/patches/boot-from-ram-and-nand.patch
trunk/src/target/u-boot/patches/boot-from-ram-reloc.patch
trunk/src/target/u-boot/patches/uboot-machtypes.patch
trunk/src/target/u-boot/patches/uboot-mokoversion.patch
trunk/src/target/u-boot/patches/uboot-s3c2410-nand.patch
trunk/src/target/u-boot/patches/uboot-s3c2410-norelocate_irqvec_cpy.patch
trunk/src/target/u-boot/patches/uboot-s3c2440.patch
Log:
sync/merge with u-boot mainline version 3e66c078003607a7d1d214c15a5f262bc1b4032f
* fix machine type related hunks
* fix head.S related failing hunks
* bump mokoversion to 11 to visualize the major re-sync of the last two commits.
PLEASE BE CAREFUL WHEN USING THIS CURRENT TREE. DON'T FLASH IT IF YOU DON'T HAVE A DEBUG BOARD!
Modified: trunk/src/target/u-boot/patches/boot-from-ram-and-nand.patch
===================================================================
--- trunk/src/target/u-boot/patches/boot-from-ram-and-nand.patch 2007-08-21 18:27:23 UTC (rev 2763)
+++ trunk/src/target/u-boot/patches/boot-from-ram-and-nand.patch 2007-08-21 18:47:23 UTC (rev 2764)
@@ -14,7 +14,7 @@
===================================================================
--- u-boot.orig/cpu/arm920t/start.S
+++ u-boot/cpu/arm920t/start.S
-@@ -157,18 +157,26 @@
+@@ -222,13 +222,11 @@
str r1, [r0]
#endif /* CONFIG_S3C2400 || CONFIG_S3C2410 */
@@ -28,6 +28,11 @@
#endif
+#endif
+ #ifdef CONFIG_AT91RM9200
+ #ifdef CONFIG_BOOTBINFUNC
+@@ -251,9 +249,19 @@
+ #endif /* CONFIG_BOOTBINFUNC */
+ #else
#ifndef CONFIG_SKIP_RELOCATE_UBOOT
-#ifndef CONFIG_S3C2410_NAND_BOOT
-relocate: /* relocate U-Boot to RAM */
@@ -46,8 +51,8 @@
+relocate: /* relocate U-Boot to RAM */
ldr r1, _TEXT_BASE /* test if we run from flash or RAM */
cmp r0, r1 /* don't reloc during debug */
- beq done_relocate
-@@ -188,10 +196,13 @@
+ beq stack_setup
+@@ -273,10 +281,13 @@
ldr pc, _done_relocate /* jump to relocated code */
_done_relocate:
.word done_relocate
@@ -65,7 +70,7 @@
/* mov r10, lr */
@ reset NAND
-@@ -275,7 +286,8 @@
+@@ -360,7 +371,8 @@
#endif
1: b 1b
done_nand_read:
@@ -73,7 +78,7 @@
+#endif /* CONFIG_S3C2410_NAND_BOOT */
+done_relocate:
#endif /* CONFIG_SKIP_RELOCATE_UBOOT */
-
+ #endif
/* Set up the stack */
Index: u-boot/include/configs/neo1973_gta01.h
===================================================================
Modified: trunk/src/target/u-boot/patches/boot-from-ram-reloc.patch
===================================================================
--- trunk/src/target/u-boot/patches/boot-from-ram-reloc.patch 2007-08-21 18:27:23 UTC (rev 2763)
+++ trunk/src/target/u-boot/patches/boot-from-ram-reloc.patch 2007-08-21 18:47:23 UTC (rev 2764)
@@ -14,7 +14,7 @@
===================================================================
--- u-boot.orig/cpu/arm920t/start.S
+++ u-boot/cpu/arm920t/start.S
-@@ -171,7 +171,7 @@ relocate: /* relocate U-Boot to RAM
+@@ -236,7 +236,7 @@
adr r0, _start /* r0 <- current position of code */
ldr r1, _TEXT_BASE /* test if we run from flash or RAM */
cmp r0, r1 /* don't reloc during debug */
@@ -23,7 +23,7 @@
ldr r2, _armboot_start
ldr r3, _bss_start
-@@ -181,8 +181,14 @@ relocate: /* relocate U-Boot to RAM
+@@ -266,8 +266,14 @@
copy_loop:
ldmia r0!, {r3-r10} /* copy from source address [r0] */
stmia r1!, {r3-r10} /* copy to target address [r1] */
@@ -39,13 +39,13 @@
#else /* NAND_BOOT */
relocate:
copy_myself:
-@@ -270,7 +276,7 @@ notmatch:
+@@ -355,7 +361,7 @@
1: b 1b
done_nand_read:
#endif /* NAND_BOOT */
-#endif /* CONFIG_SKIP_RELOCATE_UBOOT */
+#endif /* CONFIG_SKIP_RELOCATE_UBOOT */
-
+ #endif
/* Set up the stack */
stack_setup:
Index: u-boot/include/configs/neo1973_gta01.h
Modified: trunk/src/target/u-boot/patches/uboot-machtypes.patch
===================================================================
--- trunk/src/target/u-boot/patches/uboot-machtypes.patch 2007-08-21 18:27:23 UTC (rev 2763)
+++ trunk/src/target/u-boot/patches/uboot-machtypes.patch 2007-08-21 18:47:23 UTC (rev 2764)
@@ -24,320 +24,20 @@
#define MACH_TYPE_HIMALAYA 448
#define MACH_TYPE_BOLFENK 449
#define MACH_TYPE_AT91RM9200KR 450
-@@ -736,7 +736,311 @@
- #define MACH_TYPE_LN2410SBC 725
- #define MACH_TYPE_CB3RUFC 726
- #define MACH_TYPE_MP2USB 727
--#define MACH_TYPE_PDNB3 1002
-+#define MACH_TYPE_NTNP425C 728
-+#define MACH_TYPE_COLIBRI 729
-+#define MACH_TYPE_PCM7220 730
-+#define MACH_TYPE_GATEWAY7001 731
-+#define MACH_TYPE_PCM027 732
-+#define MACH_TYPE_CMPXA 733
-+#define MACH_TYPE_ANUBIS 734
-+#define MACH_TYPE_ITE8152 735
-+#define MACH_TYPE_LPC3XXX 736
-+#define MACH_TYPE_PUPPETEER 737
-+#define MACH_TYPE_MACH_VADATECH 738
-+#define MACH_TYPE_E570 739
-+#define MACH_TYPE_X50 740
-+#define MACH_TYPE_RECON 741
-+#define MACH_TYPE_XBOARDGP8 742
-+#define MACH_TYPE_FPIC2 743
-+#define MACH_TYPE_AKITA 744
-+#define MACH_TYPE_A81 745
-+#define MACH_TYPE_SVM_SC25X 746
-+#define MACH_TYPE_VADATECH020 747
-+#define MACH_TYPE_TLI 748
-+#define MACH_TYPE_EDB9315LC 749
-+#define MACH_TYPE_PASSEC 750
-+#define MACH_TYPE_DS_TIGER 751
-+#define MACH_TYPE_E310 752
-+#define MACH_TYPE_E330 753
-+#define MACH_TYPE_RT3000 754
-+#define MACH_TYPE_NOKIA770 755
-+#define MACH_TYPE_PNX0106 756
-+#define MACH_TYPE_HX21XX 757
-+#define MACH_TYPE_FARADAY 758
-+#define MACH_TYPE_SBC9312 759
-+#define MACH_TYPE_BATMAN 760
-+#define MACH_TYPE_JPD201 761
-+#define MACH_TYPE_MIPSA 762
-+#define MACH_TYPE_KACOM 763
-+#define MACH_TYPE_SWARCOCPU 764
-+#define MACH_TYPE_SWARCODSL 765
-+#define MACH_TYPE_BLUEANGEL 766
-+#define MACH_TYPE_HAIRYGRAMA 767
-+#define MACH_TYPE_BANFF 768
-+#define MACH_TYPE_CARMEVA 769
-+#define MACH_TYPE_SAM255 770
-+#define MACH_TYPE_PPM10 771
-+#define MACH_TYPE_EDB9315A 772
-+#define MACH_TYPE_SUNSET 773
-+#define MACH_TYPE_STARGATE2 774
-+#define MACH_TYPE_INTELMOTE2 775
-+#define MACH_TYPE_TRIZEPS4 776
-+#define MACH_TYPE_MAINSTONE2 777
-+#define MACH_TYPE_EZ_IXP42X 778
-+#define MACH_TYPE_TAPWAVE_ZODIAC 779
-+#define MACH_TYPE_UNIVERSALMETER 780
-+#define MACH_TYPE_HICOARM9 781
-+#define MACH_TYPE_PNX4008 782
-+#define MACH_TYPE_KWS6000 783
-+#define MACH_TYPE_PORTUX920T 784
-+#define MACH_TYPE_EZ_X5 785
-+#define MACH_TYPE_OMAP_RUDOLPH 786
-+#define MACH_TYPE_CPUAT91 787
-+#define MACH_TYPE_REA9200 788
-+#define MACH_TYPE_ACTS_PUNE_SA1110 789
-+#define MACH_TYPE_IXP425 790
-+#define MACH_TYPE_ARGONPLUSODYSSEY 791
-+#define MACH_TYPE_PERCH 792
-+#define MACH_TYPE_EIS05R1 793
-+#define MACH_TYPE_PEPPERPAD 794
-+#define MACH_TYPE_SB3010 795
-+#define MACH_TYPE_RM9200 796
-+#define MACH_TYPE_DMA03 797
-+#define MACH_TYPE_ROAD_S101 798
-+#define MACH_TYPE_IQ_NEXTGEN_A 799
-+#define MACH_TYPE_IQ_NEXTGEN_B 800
-+#define MACH_TYPE_IQ_NEXTGEN_C 801
-+#define MACH_TYPE_IQ_NEXTGEN_D 802
-+#define MACH_TYPE_IQ_NEXTGEN_E 803
-+#define MACH_TYPE_MALLOW_AT91 804
-+#define MACH_TYPE_CYBERTRACKER_I 805
-+#define MACH_TYPE_GESBC931X 806
-+#define MACH_TYPE_CENTIPAD 807
-+#define MACH_TYPE_ARMSOC 808
-+#define MACH_TYPE_SE4200 809
-+#define MACH_TYPE_EMS197A 810
-+#define MACH_TYPE_MICRO9 811
-+#define MACH_TYPE_MICRO9L 812
-+#define MACH_TYPE_UC5471DSP 813
-+#define MACH_TYPE_SJ5471ENG 814
-+#define MACH_TYPE_CMPXA26X 815
-+#define MACH_TYPE_NC 816
-+#define MACH_TYPE_OMAP_PALMTE 817
-+#define MACH_TYPE_AJAX52X 818
-+#define MACH_TYPE_SIRIUSTAR 819
-+#define MACH_TYPE_IODATA_HDLG 820
-+#define MACH_TYPE_AT91RM9200UTL 821
-+#define MACH_TYPE_BIOSAFE 822
-+#define MACH_TYPE_MP1000 823
-+#define MACH_TYPE_PARSY 824
-+#define MACH_TYPE_CCXP 825
-+#define MACH_TYPE_OMAP_GSAMPLE 826
-+#define MACH_TYPE_REALVIEW_EB 827
-+#define MACH_TYPE_SAMOA 828
-+#define MACH_TYPE_T3XSCALE 829
-+#define MACH_TYPE_I878 830
-+#define MACH_TYPE_BORZOI 831
-+#define MACH_TYPE_GECKO 832
-+#define MACH_TYPE_DS101 833
-+#define MACH_TYPE_OMAP_PALMTT2 834
-+#define MACH_TYPE_XSCALE_PALMLD 835
-+#define MACH_TYPE_CC9C 836
-+#define MACH_TYPE_SBC1670 837
-+#define MACH_TYPE_IXDP28X5 838
-+#define MACH_TYPE_OMAP_PALMTT 839
-+#define MACH_TYPE_ML696K 840
-+#define MACH_TYPE_ARCOM_ZEUS 841
-+#define MACH_TYPE_OSIRIS 842
-+#define MACH_TYPE_MAESTRO 843
-+#define MACH_TYPE_TUNGE2 844
-+#define MACH_TYPE_IXBBM 845
-+#define MACH_TYPE_MX27 846
-+#define MACH_TYPE_AX8004 847
-+#define MACH_TYPE_AT91SAM9261EK 848
-+#define MACH_TYPE_LOFT 849
-+#define MACH_TYPE_MAGPIE 850
-+#define MACH_TYPE_MX21 851
-+#define MACH_TYPE_MB87M3400 852
-+#define MACH_TYPE_MGUARD_DELTA 853
-+#define MACH_TYPE_DAVINCI_DVDP 854
-+#define MACH_TYPE_HTCUNIVERSAL 855
-+#define MACH_TYPE_TPAD 856
-+#define MACH_TYPE_ROVERP3 857
-+#define MACH_TYPE_JORNADA928 858
-+#define MACH_TYPE_MV88FXX81 859
-+#define MACH_TYPE_STMP36XX 860
-+#define MACH_TYPE_SXNI79524 861
-+#define MACH_TYPE_AMS_DELTA 862
-+#define MACH_TYPE_URANIUM 863
-+#define MACH_TYPE_UCON 864
-+#define MACH_TYPE_NAS100D 865
-+#define MACH_TYPE_L083_1000 866
-+#define MACH_TYPE_EZX 867
-+#define MACH_TYPE_PNX5220 868
-+#define MACH_TYPE_BUTTE 869
-+#define MACH_TYPE_SRM2 870
-+#define MACH_TYPE_DSBR 871
-+#define MACH_TYPE_CRYSTALBALL 872
-+#define MACH_TYPE_TINYPXA27X 873
-+#define MACH_TYPE_HERBIE 874
-+#define MACH_TYPE_MAGICIAN 875
-+#define MACH_TYPE_CM4002 876
-+#define MACH_TYPE_B4 877
-+#define MACH_TYPE_MAUI 878
-+#define MACH_TYPE_CYBERTRACKER_G 879
-+#define MACH_TYPE_NXDKN 880
-+#define MACH_TYPE_MIO8390 881
-+#define MACH_TYPE_OMI_BOARD 882
-+#define MACH_TYPE_MX21CIV 883
-+#define MACH_TYPE_MAHI_CDAC 884
-+#define MACH_TYPE_XSCALE_PALMTX 885
-+#define MACH_TYPE_S3C2413 887
-+#define MACH_TYPE_SAMSYS_EP0 888
-+#define MACH_TYPE_WG302V1 889
-+#define MACH_TYPE_WG302V2 890
-+#define MACH_TYPE_EB42X 891
-+#define MACH_TYPE_IQ331ES 892
-+#define MACH_TYPE_COSYDSP 893
-+#define MACH_TYPE_UPLAT7D 894
-+#define MACH_TYPE_PTDAVINCI 895
-+#define MACH_TYPE_MBUS 896
-+#define MACH_TYPE_NADIA2VB 897
-+#define MACH_TYPE_R1000 898
-+#define MACH_TYPE_HW90250 899
-+#define MACH_TYPE_OMAP_2430SDP 900
-+#define MACH_TYPE_DAVINCI_EVM 901
-+#define MACH_TYPE_OMAP_TORNADO 902
-+#define MACH_TYPE_OLOCREEK 903
-+#define MACH_TYPE_PALMZ72 904
-+#define MACH_TYPE_NXDB500 905
-+#define MACH_TYPE_APF9328 906
-+#define MACH_TYPE_OMAP_WIPOQ 907
-+#define MACH_TYPE_OMAP_TWIP 908
-+#define MACH_TYPE_XSCALE_PALMTREO650 909
-+#define MACH_TYPE_ACUMEN 910
-+#define MACH_TYPE_XP100 911
-+#define MACH_TYPE_FS2410 912
-+#define MACH_TYPE_PXA270_CERF 913
-+#define MACH_TYPE_SQ2FTLPALM 914
-+#define MACH_TYPE_BSEMSERVER 915
-+#define MACH_TYPE_NETCLIENT 916
-+#define MACH_TYPE_XSCALE_PALMTT5 917
-+#define MACH_TYPE_OMAP_PALMTC 918
-+#define MACH_TYPE_OMAP_APOLLON 919
-+#define MACH_TYPE_ARGONLVEVB 920
-+#define MACH_TYPE_REA_2D 921
-+#define MACH_TYPE_TI3E524 922
-+#define MACH_TYPE_ATEB9200 923
-+#define MACH_TYPE_AUCKLAND 924
-+#define MACH_TYPE_AK3320M 925
-+#define MACH_TYPE_DURAMAX 926
-+#define MACH_TYPE_N35 927
-+#define MACH_TYPE_PRONGHORN 928
-+#define MACH_TYPE_FUNDY 929
-+#define MACH_TYPE_LOGICPD_PXA270 930
-+#define MACH_TYPE_CPU777 931
-+#define MACH_TYPE_SIMICON9201 932
-+#define MACH_TYPE_LEAP2_HPM 933
-+#define MACH_TYPE_CM922TXA10 934
-+#define MACH_TYPE_PXA 935
-+#define MACH_TYPE_SANDGATE2 936
-+#define MACH_TYPE_SANDGATE2G 937
-+#define MACH_TYPE_SANDGATE2P 938
-+#define MACH_TYPE_FRED_JACK 939
-+#define MACH_TYPE_TTG_COLOR1 940
-+#define MACH_TYPE_NXEB500HMI 941
-+#define MACH_TYPE_NETDCU8 942
-+#define MACH_TYPE_ML675050_CPU_BOA 943
-+#define MACH_TYPE_NG_FVX538 944
-+#define MACH_TYPE_NG_FVS338 945
-+#define MACH_TYPE_PNX4103 946
-+#define MACH_TYPE_HESDB 947
-+#define MACH_TYPE_XSILO 948
-+#define MACH_TYPE_ESPRESSO 949
-+#define MACH_TYPE_EMLC 950
-+#define MACH_TYPE_SISTERON 951
-+#define MACH_TYPE_RX1950 952
-+#define MACH_TYPE_TSC_VENUS 953
-+#define MACH_TYPE_DS101J 954
-+#define MACH_TYPE_MXC30030ADS 955
-+#define MACH_TYPE_FUJITSU_WIMAXSOC 956
-+#define MACH_TYPE_DUALPCMODEM 957
-+#define MACH_TYPE_GESBC9312 958
-+#define MACH_TYPE_HTCAPACHE 959
-+#define MACH_TYPE_IXDP435 960
-+#define MACH_TYPE_CATPROVT100 961
-+#define MACH_TYPE_PICOTUX1XX 962
-+#define MACH_TYPE_PICOTUX2XX 963
-+#define MACH_TYPE_DSMG600 964
-+#define MACH_TYPE_EMPC2 965
-+#define MACH_TYPE_VENTURA 966
-+#define MACH_TYPE_PHIDGET_SBC 967
-+#define MACH_TYPE_IJ3K 968
-+#define MACH_TYPE_PISGAH 969
-+#define MACH_TYPE_OMAP_FSAMPLE 970
-+#define MACH_TYPE_SG720 971
-+#define MACH_TYPE_REDFOX 972
-+#define MACH_TYPE_MYSH_EP9315_1 973
-+#define MACH_TYPE_TPF106 974
-+#define MACH_TYPE_AT91RM9200KG 975
-+#define MACH_TYPE_SLEDB 976
-+#define MACH_TYPE_ONTRACK 977
-+#define MACH_TYPE_PM1200 978
-+#define MACH_TYPE_ESS24XXX 979
-+#define MACH_TYPE_COREMP7 980
-+#define MACH_TYPE_NEXCODER_6446 981
-+#define MACH_TYPE_STVC8380 982
-+#define MACH_TYPE_TEKLYNX 983
-+#define MACH_TYPE_CARBONADO 984
-+#define MACH_TYPE_SYSMOS_MP730 985
-+#define MACH_TYPE_SNAPPER_CL15 986
-+#define MACH_TYPE_PGIGIM 987
-+#define MACH_TYPE_PTX9160P2 988
-+#define MACH_TYPE_DCORE1 989
-+#define MACH_TYPE_VICTORPXA 990
-+#define MACH_TYPE_MX2DTB 991
-+#define MACH_TYPE_PXA_IREX_ER0100 992
-+#define MACH_TYPE_OMAP_PALMZ71 993
-+#define MACH_TYPE_BARTEC_DEG 994
-+#define MACH_TYPE_HW50251 995
-+#define MACH_TYPE_IBOX 996
-+#define MACH_TYPE_ATLASLH7A404 997
-+#define MACH_TYPE_PT2026 998
-+#define MACH_TYPE_HTCALPINE 999
-+#define MACH_TYPE_BARTEC_VTU 1000
-+#define MACH_TYPE_VCOREII 1001
-+#define MACH_TYPE_PDNB3 1002
-+#define MACH_TYPE_HTCBEETLES 1003
-+#define MACH_TYPE_S3C6400 1004
-+#define MACH_TYPE_S3C2443 1005
-+#define MACH_TYPE_OMAP_LDK 1006
-+#define MACH_TYPE_SMDK2460 1007
-+#define MACH_TYPE_SMDK2440 1008
-+#define MACH_TYPE_SMDK2412 1009
-+#define MACH_TYPE_WEBBOX 1010
-+#define MACH_TYPE_CWWNDP 1011
-+#define MACH_TYPE_DRAGON 1012
-+#define MACH_TYPE_OPENDO_CPU_BOARD 1013
-+#define MACH_TYPE_CCM2200 1014
-+#define MACH_TYPE_ETWARM 1015
-+#define MACH_TYPE_M93030 1016
-+#define MACH_TYPE_CC7U 1017
-+#define MACH_TYPE_MTT_RANGER 1018
-+#define MACH_TYPE_NEXUS 1019
-+#define MACH_TYPE_DESMAN 1020
-+#define MACH_TYPE_BKDE303 1021
-+#define MACH_TYPE_SMDK2413 1022
-+#define MACH_TYPE_AML_M7200 1023
-+#define MACH_TYPE_AML_M5900 1024
-+#define MACH_TYPE_SG640 1025
-+#define MACH_TYPE_EDG79524 1026
-+#define MACH_TYPE_AI2410 1027
-+#define MACH_TYPE_IXP465 1028
-+#define MACH_TYPE_BALLOON3 1029
-+#define MACH_TYPE_QT2410 1108
-+#define MACH_TYPE_NEO1973_GTA01 1182
-+#define MACH_TYPE_HXD8 1303
-+#define MACH_TYPE_NEO1973_GTA02 1304
+@@ -739,8 +739,12 @@
+ #define MACH_TYPE_AT91SAM9261EK 848
+ #define MACH_TYPE_PDNB3 1002
+ #define MACH_TYPE_AT91SAM9260EK 1099
++#define MACH_TYPE_QT2410 1108
++#define MACH_TYPE_NEO1973_GTA01 1182
+ #define MACH_TYPE_AT91RM9200DF 1119
+ #define MACH_TYPE_AT91SAM9263EK 1202
++#define MACH_TYPE_HXD8 1303
++#define MACH_TYPE_NEO1973_GTA02 1304
#ifdef CONFIG_ARCH_EBSA110
# ifdef machine_arch_type
-@@ -3541,9 +3845,9 @@
+@@ -3545,9 +3549,9 @@
# else
# define machine_arch_type MACH_TYPE_RAMSES
# endif
@@ -349,7 +49,7 @@
#endif
#ifdef CONFIG_ARCH_S28X
-@@ -4501,9 +4805,9 @@
+@@ -4505,9 +4509,9 @@
# else
# define machine_arch_type MACH_TYPE_M825XX
# endif
@@ -361,7 +61,7 @@
#endif
#ifdef CONFIG_SA1100_M7100
-@@ -5658,16 +5962,16 @@
+@@ -5662,16 +5666,16 @@
# define machine_is_xcep() (0)
#endif
@@ -382,7 +82,7 @@
#endif
#ifdef CONFIG_MACH_STARGATE
-@@ -6054,16 +6358,16 @@
+@@ -6058,16 +6062,16 @@
# define machine_is_ess710() (0)
#endif
@@ -403,7 +103,7 @@
#endif
#ifdef CONFIG_MACH_HIMALAYA
-@@ -7333,9 +7637,9 @@
+@@ -7337,9 +7341,9 @@
# else
# define machine_arch_type MACH_TYPE_ARGONPLUSEVB
# endif
@@ -415,7 +115,7 @@
#endif
#ifdef CONFIG_MACH_SCMA11EVB
-@@ -7345,9 +7649,9 @@
+@@ -7349,9 +7353,9 @@
# else
# define machine_arch_type MACH_TYPE_SCMA11EVB
# endif
@@ -427,7 +127,7 @@
#endif
#ifdef CONFIG_MACH_SMDK2800
-@@ -8305,9 +8609,9 @@
+@@ -8309,9 +8313,9 @@
# else
# define machine_arch_type MACH_TYPE_SCMA11BB
# endif
@@ -439,7 +139,7 @@
#endif
#ifdef CONFIG_MACH_TRIZEPS3
-@@ -9193,9 +9497,9 @@
+@@ -9197,9 +9201,9 @@
# else
# define machine_arch_type MACH_TYPE_ZEUSEVB
# endif
@@ -451,8 +151,8 @@
#endif
#ifdef CONFIG_MACH_P700
-@@ -9402,6 +9706,3667 @@
- # define machine_is_mp2usb() (0)
+@@ -9471,6 +9475,3667 @@
+ # define machine_is_at91sam9263ek() (0)
#endif
+#ifdef CONFIG_MACH_NTNP425C
Modified: trunk/src/target/u-boot/patches/uboot-mokoversion.patch
===================================================================
--- trunk/src/target/u-boot/patches/uboot-mokoversion.patch 2007-08-21 18:27:23 UTC (rev 2763)
+++ trunk/src/target/u-boot/patches/uboot-mokoversion.patch 2007-08-21 18:47:23 UTC (rev 2764)
@@ -7,4 +7,4 @@
fi
fi
+
-+printf '%s' -moko10
++printf '%s' -moko11
Modified: trunk/src/target/u-boot/patches/uboot-s3c2410-nand.patch
===================================================================
--- trunk/src/target/u-boot/patches/uboot-s3c2410-nand.patch 2007-08-21 18:27:23 UTC (rev 2763)
+++ trunk/src/target/u-boot/patches/uboot-s3c2410-nand.patch 2007-08-21 18:47:23 UTC (rev 2764)
@@ -369,18 +369,18 @@
#include <config.h>
#include <version.h>
+#include <s3c2410.h>
-
-
- /*
-@@ -161,6 +166,7 @@
+ #if defined(CONFIG_AT91RM9200DK) || defined(CONFIG_AT91RM9200EK) || defined(CONFIG_AT91RM9200DF)
+ #include <led.h>
#endif
-
+@@ -246,6 +251,7 @@
+ #endif /* CONFIG_BOOTBINFUNC */
+ #else
#ifndef CONFIG_SKIP_RELOCATE_UBOOT
+#ifndef CONFIG_S3C2410_NAND_BOOT
relocate: /* relocate U-Boot to RAM */
adr r0, _start /* r0 <- current position of code */
ldr r1, _TEXT_BASE /* test if we run from flash or RAM */
-@@ -177,6 +183,93 @@
+@@ -262,6 +268,93 @@
stmia r1!, {r3-r10} /* copy to target address [r1] */
cmp r0, r2 /* until source end addreee [r2] */
ble copy_loop
@@ -472,7 +472,7 @@
+done_nand_read:
+#endif /* NAND_BOOT */
#endif /* CONFIG_SKIP_RELOCATE_UBOOT */
-
+ #endif
/* Set up the stack */
Index: u-boot/include/s3c2410.h
===================================================================
Modified: trunk/src/target/u-boot/patches/uboot-s3c2410-norelocate_irqvec_cpy.patch
===================================================================
--- trunk/src/target/u-boot/patches/uboot-s3c2410-norelocate_irqvec_cpy.patch 2007-08-21 18:27:23 UTC (rev 2763)
+++ trunk/src/target/u-boot/patches/uboot-s3c2410-norelocate_irqvec_cpy.patch 2007-08-21 18:47:23 UTC (rev 2764)
@@ -5,11 +5,10 @@
===================================================================
--- u-boot.orig/cpu/arm920t/start.S
+++ u-boot/cpu/arm920t/start.S
-@@ -332,7 +332,23 @@ done_nand_read:
+@@ -458,6 +458,22 @@
strb r1, [r0]
#endif /* CONFIG_S3C2410_NAND_BOOT */
done_relocate:
--#endif /* CONFIG_SKIP_RELOCATE_UBOOT */
+
+#if defined(CONFIG_USE_IRQ) && defined(CONFIG_S3C2410)
+ /* In the case of the S3C2410, if we've somehow magically (JTAG, ...)
@@ -26,7 +25,6 @@
+ bne irqvec_cpy_next
+#endif /* CONFIG_USE_IRQ */
+
-+#endif /* !CONFIG_SKIP_RELOCATE_UBOOT */
-
+ #endif /* CONFIG_SKIP_RELOCATE_UBOOT */
+ #endif
/* Set up the stack */
- stack_setup:
Modified: trunk/src/target/u-boot/patches/uboot-s3c2440.patch
===================================================================
--- trunk/src/target/u-boot/patches/uboot-s3c2440.patch 2007-08-21 18:27:23 UTC (rev 2763)
+++ trunk/src/target/u-boot/patches/uboot-s3c2440.patch 2007-08-21 18:47:23 UTC (rev 2764)
@@ -483,7 +483,7 @@
===================================================================
--- u-boot.orig/include/common.h
+++ u-boot/include/common.h
-@@ -469,7 +469,7 @@
+@@ -479,7 +479,7 @@
ulong get_OPB_freq (void);
ulong get_PCI_freq (void);
#endif
@@ -749,10 +749,10 @@
+#elif defined(CONFIG_S3C2440)
+#include <s3c2440.h>
+#endif
-
-
- /*
-@@ -142,14 +146,32 @@
+ #if defined(CONFIG_AT91RM9200DK) || defined(CONFIG_AT91RM9200EK) || defined(CONFIG_AT91RM9200DF)
+ #include <led.h>
+ #endif
+@@ -207,14 +211,32 @@
# define pWTCON 0x15300000
# define INTMSK 0x14400008 /* Interupt-Controller base addresses */
# define CLKDIVN 0x14800014 /* clock divisor register */
@@ -787,7 +787,7 @@
ldr r0, =pWTCON
mov r1, #0x0
str r1, [r0]
-@@ -160,24 +182,34 @@
+@@ -225,24 +247,34 @@
mov r1, #0xffffffff
ldr r0, =INTMSK
str r1, [r0]
@@ -829,7 +829,7 @@
str r1, [r0]
/* Page 7-19, seven nops between UPLL and MPLL */
-@@ -189,12 +221,12 @@
+@@ -254,12 +286,12 @@
nop
nop
@@ -844,7 +844,7 @@
str r1, [r0]
#if 1
-@@ -222,7 +254,7 @@
+@@ -287,7 +319,7 @@
str r1, [r0, #0x28]
#endif
@@ -853,7 +853,7 @@
#ifndef CONFIG_SKIP_LOWLEVEL_INIT
#ifndef CONFIG_LL_INIT_NAND_ONLY
-@@ -279,7 +311,7 @@
+@@ -364,7 +396,7 @@
#if !defined(CONFIG_SKIP_LOWLEVEL_INIT) && defined(CONFIG_LL_INIT_NAND_ONLY)
bl cpu_init_crit
#endif
@@ -862,7 +862,7 @@
/* ensure some refresh has happened */
ldr r1, =0xfffff
1: subs r1, r1, #1
-@@ -290,11 +322,12 @@
+@@ -375,11 +407,12 @@
ldr r0, [ r1 ]
tst r0, #0x02 /* is this resume from power down */
ldrne pc, [r1, #4] /* gstatus3 */
@@ -876,7 +876,7 @@
@ reset NAND
mov r1, #S3C2410_NAND_BASE
ldr r2, =0xf842 @ initial value enable tacls=3,rph0=6,rph1=0
-@@ -314,6 +347,17 @@
+@@ -399,6 +432,17 @@
ldr r2, [r1, #oNFCONF]
orr r2, r2, #0x800 @ disable chip
str r2, [r1, #oNFCONF]
@@ -894,7 +894,7 @@
#if 0
@ get ready to call C functions (for nand_read())
-@@ -382,7 +426,7 @@
+@@ -467,7 +511,7 @@
#endif /* CONFIG_S3C2410_NAND_BOOT */
done_relocate:
More information about the commitlog
mailing list
